weizhengliang 4 年之前
父节点
当前提交
619c38caaa

+ 3 - 1
app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -1378,12 +1378,14 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
      * 设置通知页面
      */
     private void setNoticeView() {
-        if (null != noticeArrayList) {
+        if (null != noticeArrayList && noticeArrayList.size() > 0) {
             String strNotice = "";
             for (int i = 0; i < noticeArrayList.size(); i++) {
                 strNotice += "      【" + (i + 1) + "】 " + noticeArrayList.get(i).getNoticeContent() + "  " + noticeArrayList.get(i).getNoticeEndTime();
             }
             tvMessage.setText(strNotice);
+        } else {
+            tvMessage.setText("当前无公告");
         }
     }
 

+ 1 - 1
app/src/main/java/com/wdkl/callingbed2/util/AnalysisUdpUtil.java

@@ -302,7 +302,7 @@ public class AnalysisUdpUtil {
                         break;
                     case "MGR_PATIENTUPDATE": //后台数据改变刷新UI
                         LogUtil.d("MGR_PATIENTUPDATE", "bed--11");
-                        if (data[2].equals(Constants.MYSELF_ID) || data[2].equals(Constants.MAC_ADDRESS)) {
+                        if (data[2].equals(Constants.MYSELF_ID) || data[1].equals(Constants.MAC_ADDRESS)) {
                             if (!Constants.UPDATE_PATIENTUPDATE_FLAG) {
                                 Constants.UPDATE_PATIENTUPDATE_FLAG = true;
                                 LogUtil.d("MGR_PATIENTUPDATE", "MGR_PATIENTUPDATE");