diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
index f6e17675..f8493361 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
@@ -40,7 +40,7 @@ public class ExecuteTheRecipe {
/**
* 等待超时时间
*/
- public static int whileTime = 10;
+ public static int whileTime = 20;
/**
* 监听变量值
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 4c734dc4..917c8649 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
@@ -233,12 +233,12 @@ public class Home1Fragment extends BaseFragment {
jiaoban_control.mListener = new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
- boolean status = (boolean) data;
- if (!IsMake(true))
+ boolean status = !(boolean) data;
+ if (!IsMake(false))
{
- jiaoban_control.SetStatus(!status);
return;
}
+ jiaoban_control.SetStatus(status);
int jd = (int) nifty_slider2.getValue();
ToastUtils.info("点击按钮：搅拌" + status + ".搅拌频率:" + jd);
ExecuteTheRecipe.WritePLC("搅拌速度", jd, new IWriteCallBack() {
@@ -267,13 +267,12 @@ public class Home1Fragment extends BaseFragment {
zhuandong_control_left.mListener = new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
- boolean status = (boolean) data;
+ boolean status = !(boolean) data;
if (!IsMake(true))
{
- zhuandong_control_left.SetStatus(!status);
return;
}
- ToastUtils.info("点击按钮：炒锅正转" + status);
+ zhuandong_control_left.SetStatus(status);
int jd = (int) nifty_slider3.getValue();
ToastUtils.info("点击按钮：搅拌" + status + ".转动频率:" + jd);
ExecuteTheRecipe.WritePLC("转动速度", jd, new IWriteCallBack() {
@@ -301,13 +300,12 @@ public class Home1Fragment extends BaseFragment {
zhuandong_control_Rift.mListener = new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
- boolean status = (boolean) data;
+ boolean status = !(boolean) data;
if (!IsMake(true))
{
- zhuandong_control_Rift.SetStatus(!status);
return;
}
- ToastUtils.info("点击按钮：炒锅反转" + status);
+ zhuandong_control_Rift.SetStatus(status);
int jd = (int) nifty_slider3.getValue();
ToastUtils.info("点击按钮：搅拌" + status + ".转动频率:" + jd);
ExecuteTheRecipe.WritePLC("转动速度", jd, new IWriteCallBack() {
@@ -335,12 +333,12 @@ public class Home1Fragment extends BaseFragment {
choushui_control.mListener = new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
- boolean status = (boolean) data;
+ boolean status = !(boolean) data;
if (!IsMake(true))
{
- choushui_control.SetStatus(!status);
return;
}
+ choushui_control.SetStatus(status);
ToastUtils.info("点击按钮：炒锅抽水" + status);
ExecuteTheRecipe.WritePLC("炒锅抽水", status, null);
}
@@ -354,12 +352,12 @@ public class Home1Fragment extends BaseFragment {
fangshui_control.mListener = new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
- boolean status = (boolean) data;
+ boolean status = !(boolean) data;
if (!IsMake(true))
{
- fangshui_control.SetStatus(!status);
return;
}
+ fangshui_control.SetStatus(status);
ToastUtils.info("点击按钮：炒锅放水" + status);
ExecuteTheRecipe.WritePLC("炒锅放水", status, null);
}
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/imagebutton_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/imagebutton_control.java
index 0cef8f75..e102cd55 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/imagebutton_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/imagebutton_control.java
@@ -75,18 +75,17 @@ public class imagebutton_control extends LinearLayout {
text_u.setText("");
}
- SetStatus(Status);
+ SetStatus(false);
}
@OnClick({R.id.startjb})
public void onViewClicked(View view) {
- switch (view.getId()) {
- case R.id.startjb:
- Status=!Status;
- SetStatus(Status);
- break;
- }
-
+// switch (view.getId()) {
+// case R.id.startjb:
+// Status=!Status;
+// SetStatus(Status);
+// break;
+// }
if(mListener!=null)
{
mListener.clickListener(root,Status);
@@ -99,6 +98,7 @@ public class imagebutton_control extends LinearLayout {
*/
public void SetStatus(boolean status)
{
+ Status=status;
if(status)
{
image_u.setImageResource(ks_ys);
diff --git a/app/src/main/res/layout/activity_bottom_navigation2.xml b/app/src/main/res/layout/activity_bottom_navigation2.xml
index ede5bc50..b8e92066 100644
--- a/app/src/main/res/layout/activity_bottom_navigation2.xml
+++ b/app/src/main/res/layout/activity_bottom_navigation2.xml
@@ -32,12 +32,12 @@
android:layout_height="match_parent"
app:water_mark_align="CENTER"
app:water_mark_degree="-30"
- app:water_mark_dx="100px"
- app:water_mark_dy="240px"
+ app:water_mark_dx="300px"
+ app:water_mark_dy="340px"
app:water_mark_sync="true"
- app:water_mark_text="四川黑菠萝科技"
+ app:water_mark_text="黑菠萝技术部"
app:water_mark_textColor="@color/watermarkcolor"
- app:water_mark_textBold="false"
- app:water_mark_textSize="12px" />
+ app:water_mark_textBold="true"
+ app:water_mark_textSize="14px" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1f74c5c5..2081776d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -66,7 +66,7 @@
#EEEEEE
#004684
#80000000
- #14000000
+ #22000000