weizhengliang 4 роки тому
батько
коміт
dccabeb450

+ 7 - 4
app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -456,6 +456,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
 
         private void callingBedNotice() throws Exception {
             if (System.currentTimeMillis() - millsCurrent > (1000 * 60 * 5)) {
+                millsCurrent = System.currentTimeMillis();
                 //床位号文字闪烁重置
                 try {
                     for (int i = 0; i < mBedDataList.size(); i++) {
@@ -466,10 +467,12 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                 }
                 //门灯重置
                 if (MyApplication.serialPortUtil != null){
-                    if (SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.DoorLight) == 0) {
-                        MyApplication.serialPortUtil.doorControl(0, null);//关闭门灯
-                    } else {
-                        MyApplication.serialPortUtil.doorControl(1, "111");//白色
+                    if (!isEnterNurseControlDoorLight) {
+                        if (SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.DoorLight) == 0) {
+                            MyApplication.serialPortUtil.doorControl(0, null);//关闭门灯
+                        } else {
+                            MyApplication.serialPortUtil.doorControl(1, "111");//白色
+                        }
                     }
                 }
 

+ 1 - 1
nurseMainLib/src/main/java/serialporttest/utils/SerialPortUtil.java

@@ -419,7 +419,7 @@ public class SerialPortUtil {
             if (isOpenSerialPortUtil) {
                 byte[] sendData = command.getBytes();
                 outputStream.write(sendData);
-                Log.i(TAG, "串口数据发送成功");
+                Log.i(TAG, "串口数据发送成功: " + command);
             }
         } catch (IOException e) {
             e.printStackTrace();