<初始化界面增加设备ID显示，按键注册时弹出toast提示>

app/src/main/java/com/wdkl/callingbed2/ui/InitActivity.java

@@ -405,22 +405,20 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
 
         // mScreenExtinguishUtil.touchScreen();//===============================息屏
 
-        //呼叫护士键短按松开
-        if (buffer[5] == 1) {
+        LogUtil.d("serialPortBedOnclick", "buffer[5]==" + buffer[5]);
+        //呼叫护士键短按/长按松开
+        if (buffer[5] == 1 | buffer[5] == 2) {
             if (null != Constants.MAC_ADDRESS) {
                 //有线mac地址，设备出场信息，无线mac地址
-                String str = "MGR_REG_A" + Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "4" + Constants.DELIMITER + android.os.Build.DISPLAY +"_"+Constants.MCU_VERSION_NUMBER +
-                        Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "FF:FF:FF:FF:FF:FF" + Constants.DELIMITER + SerialPortUtil.KEY_ID;
-                UdpSendUtil.sendManualReboot(str);
-            }
-        }
-        //呼叫护士键长按松开
-        if (buffer[5] == 2) {
-            if (null != Constants.MAC_ADDRESS) {
-                //有线mac地址，设备出场信息，无线mac地址
-                String str = "MGR_REG_A" + Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "4" + Constants.DELIMITER + android.os.Build.DISPLAY +"_"+Constants.MCU_VERSION_NUMBER +
+                final String str = "MGR_REG_A" + Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "4" + Constants.DELIMITER + android.os.Build.DISPLAY +"_"+Constants.MCU_VERSION_NUMBER +
                         Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "FF:FF:FF:FF:FF:FF" + Constants.DELIMITER + SerialPortUtil.KEY_ID;
                 UdpSendUtil.sendManualReboot(str);
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ToastUtil.showToast("收到按键消息，发送注册信息：" + str);
+                    }
+                });
             }
         }
     }

app/src/main/java/com/wdkl/callingbed2/util/StringUtils.java

@@ -29,6 +29,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import serialporttest.utils.SerialPortUtil;
+
 /**
  * 类描述：字符串操作工具包
  * 创建人：Waderson Shll
@@ -76,6 +78,7 @@ public class StringUtils {
         String str = "\r\nApp名称: " + MyApplication.getAppContext().getString(R.string.app_name)
                 + "\r\nAPP版本号: V" + BuildConfig.VERSION_NAME
                 + "\r\nMCU版本号: " + Constants.MCU_VERSION_NUMBER
+                + "\r\n设备ID: " + SerialPortUtil.KEY_ID
                 + "\r\n中央服务器系列"
                 + "\r\n发布日期:" + BuildConfig.BUILD_TIME;
         if (android.os.Build.VERSION.SDK_INT >= 26) { //android8.0 = 26