无修改

app/build.gradle

@@ -31,11 +31,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-<<<<<<< HEAD
-        versionName "1.43"
-=======
         versionName "1.45"
->>>>>>> 21746d5e2a7c6c020404a673a1951fe13b4a6936
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "BUILD_TIME", getDate()

app/src/main/java/com/wdkl/callingbed/ui/CallingBedActivity.java

@@ -914,11 +914,13 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                     .execute(new StringCallback() {
                         @Override
                         public void onError(Call call, Exception e, int id) {
+                            Log.e(TAG,"getNoticeData() 获得通知信息失败");
                             hideProgress();
                         }
 
                         @Override
                         public void onResponse(String response, int id) {
+                            Log.e(TAG,"getNoticeData() 获得通知信息"+response.toString());
                             String data = response.substring(0, response.length() - 4);
                             try {
                                 Gson gson = new Gson();
@@ -992,6 +994,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                                 handler.sendEmptyMessage(MAIN_DATA_ERROR);
                             }
                             Constants.UPDATE_PATIENTUPDATE_FLAG = false;
+                            Log.e(TAG,"Constants.UPDATE_PATIENTUPDATE_FLAG "+Constants.UPDATE_PATIENTUPDATE_FLAG);
                         }
                     });
         } else {
@@ -1244,6 +1247,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             for (int i = 0; i < noticeArrayList.size(); i++) {
                 strNotice += "      【" + (i + 1) + "】 " + noticeArrayList.get(i).getNoticeContent() + "  " + noticeArrayList.get(i).getNoticeEndTime();
             }
+            Log.e(TAG,"setNoticeView() 通知消息"+strNotice);
             tvNoticeContent.setText(strNotice);
         }
     }

app/src/main/java/com/wdkl/callingbed/util/AnalysisUdpUtil.java

@@ -338,8 +338,11 @@ public class AnalysisUdpUtil {
                         break;
                     case "MGR_PATIENTUPDATE": //后台数据改变刷新UI
                         LogUtil.d("MGR_PATIENTUPDATE", "bed--11");
+                        LogUtil.d("MGR_PATIENTUPDATE","data[2] "+data[2]+" ddd "+Constants.MYSELF_ID);
                         if (data[2].equals(Constants.MYSELF_ID)) { //ID匹配；刷新本机
+                            LogUtil.d("MGR_PATIENTUPDATE","Constants.UPDATE_PATIENTUPDATE_FLAG "+Constants.UPDATE_PATIENTUPDATE_FLAG);
                             if (!Constants.UPDATE_PATIENTUPDATE_FLAG) {
+                                LogUtil.d("MGR_PATIENTUPDATE", "bed--22");
                                 EventBus.getDefault().post(new MessageEvent(null, Constants.EVENT_MGR_PATIENTUPDATE));
                             }
                             Constants.UPDATE_PATIENTUPDATE_FLAG = true;