Merge remote-tracking branch 'origin/桌面小炒机' into 桌面小炒机

app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/ModbusMaster.java

@@ -280,7 +280,6 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
         new ExceptionServer(address, length, new IExceptionHandling() {
             @Override
             public void onSuccess(int add) throws InterruptedException, ExecutionException, ModbusTransportException, ModbusInitException, ModbusRespException {
-                IsConnected = true;
                 ReadCoilsResponse res = mw.syncReadCoil(SlaveId, add, length);
                 boolean[] data = res.getBooleanData();
                 boolean[] result = Arrays.copyOfRange(data, 0, length);
@@ -288,6 +287,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                     LogUtils.d(TAG+"ReadBool address="+address+" 读操作 成功：data="+data.toString()+"  bytes="+result);
                 }
                 resultValue.set(OperateResultT.CreateSuccess(result));
+                IsConnected = true;
             }
 
             @Override
@@ -329,6 +329,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 boolean[] data = res.getBooleanData();
                 boolean[] result = Arrays.copyOfRange(data, 0, length);
                 resultValue.set(OperateResultT.CreateSuccess(result));
+                IsConnected = true;
             }
 
             @Override
@@ -370,6 +371,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 }
                 if (data.length == length) {
                     resultValue.set(OperateResultT.CreateSuccess(data));
+                    IsConnected = true;
                 }
             }
 
@@ -409,6 +411,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 int[] tempValues= IntLib.ToInts(res.getData(),ReadDataFormat);
                 if(tempValues.length==length){
                     resultValue.set(OperateResultT.CreateSuccess(tempValues));
+                    IsConnected = true;
                 }else{
                     resultValue.set(OperateResultT.CreateFailedT(address+"，读取失败，返回长度和实际读取长度不匹配"));
                 }
@@ -458,6 +461,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 if(data.length==tempLength){
                     byte[] result = Arrays.copyOfRange(data, 0, length);
                     resultValue.set(OperateResultT.CreateSuccess(result));
+                    IsConnected = true;
                 }else{
                     resultValue.set(OperateResultT.CreateFailedT(address+"，读取失败，返回长度和实际读取长度不匹配"));
                 }
@@ -485,6 +489,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 try {
                     if (data.length ==length*2) {
                         resultValue.set(OperateResultT.CreateSuccess(new String(data, "UTF-8").trim()));
+                        IsConnected = true;
                     }
                 } catch (UnsupportedEncodingException ex) {
                     resultValue.set(OperateResultT.CreateFailedT(address+"，读取失败，字符串解析失败："+ex.toString()));
@@ -512,6 +517,7 @@ public class ModbusMaster implements IRead,IWrite ,IModbusMaster{
                 float[] tempValues = FloatLib.ToFloats(res.getData(),ReadDataFormat);
                 if (tempValues.length == length) {
                     resultValue.set(OperateResultT.CreateSuccess(tempValues));
+                    IsConnected = true;
                 }else{
                     resultValue.set(OperateResultT.CreateFailedT(address+"，读取失败，返回长度和实际读取长度不匹配"));
                 }

app/src/main/java/com/bonait/bnframework/ui/activity/RecProcessActivity.java

@@ -359,6 +359,10 @@ public class RecProcessActivity extends BaseActivity {
                             break;
 
                         case "打散搅拌":
+                            if(isUp){
+                                NewToastUtil.getInstance().showToast("上升状态无法启动搅拌");
+                                return;
+                            }
                             isScatterStir = true;
                             viewBinding.device.btnStir.setBackgroundResource(R.drawable.bg_btn_run_anim_looper);
                             ((AnimationDrawable)viewBinding.device.btnStir.getBackground()).start();

app/src/main/java/com/bonait/bnframework/ui/fragment/HomeDevicesFragment.java

@@ -242,6 +242,10 @@ public class HomeDevicesFragment extends BaseFragment {
                             break;
 
                         case "打散搅拌":
+                            if(isUp){
+                                NewToastUtil.getInstance().showToast("上升状态无法启动搅拌");
+                                return;
+                            }
                             isScatterStir = true;
                             viewBinding.device.btnStir.setBackgroundResource(R.drawable.bg_btn_run_anim_looper);
                             ((AnimationDrawable)viewBinding.device.btnStir.getBackground()).start();

app/src/main/res/layout/activity_cook.xml

@@ -13,7 +13,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:layout_marginTop="@dimen/home_tab_height"
-        android:background="@mipmap/makenewbj"
         >
         <!--android:background="@color/qmui_config_color_white"-->
 
@@ -40,7 +39,7 @@
                 android:singleLine="true"
                 android:ellipsize="middle"
                 android:layout_marginEnd="@dimen/dp_110"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textSize="45dp" />
 
             <TextView
@@ -50,7 +49,7 @@
                 android:fontFamily="@font/ziti0"
                 android:text="00 : 00"
                 android:layout_below="@id/goodname"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textSize="50dp"
                 android:textStyle="bold" />
 

app/src/main/res/layout/dialog/layout/layout_stir_control.xml

@@ -18,6 +18,20 @@
         android:paddingLeft="@dimen/dp_20"
         />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="@id/title_fire"
+        app:layout_constraintBottom_toBottomOf="@id/title_fire"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:textSize="@dimen/sp_28"
+        android:textColor="#FF9800"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:text="(上升状态禁止搅拌)"
+        android:paddingLeft="@dimen/dp_230"
+        />
+
     <TextView
         android:id="@+id/tv_fire_select"
         android:layout_width="wrap_content"

app/src/main/res/layout/fragment_home_devices.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@mipmap/makenewbj"
     android:layout_height="match_parent">
 
     <TextView
@@ -10,7 +9,7 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/dp_10"
         android:textSize="@dimen/sp_32"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:textStyle="bold"
         android:text="设备状态:"
         />
@@ -21,7 +20,7 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/dp_10"
         android:textSize="@dimen/sp_32"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:textStyle="bold"
         android:text="设备信息:"
         android:layout_marginTop="@dimen/dp_50"