解决合并冲突

app/build.gradle

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

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

@@ -338,18 +338,10 @@ public class AnalysisUdpUtil {
                         break;
                     case "MGR_PATIENTUPDATE": //后台数据改变刷新UI
                         LogUtil.d("MGR_PATIENTUPDATE", "bed--11");
-<<<<<<< HEAD
-                        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");
-=======
                         if (data[2].equals(Constants.MYSELF_ID) || data[2].equals(Constants.MAC_ADDRESS)) {
                             if (!Constants.UPDATE_PATIENTUPDATE_FLAG) {
                                 Constants.UPDATE_PATIENTUPDATE_FLAG = true;
                                 LogUtil.d("MGR_PATIENTUPDATE", "MGR_PATIENTUPDATE");
->>>>>>> c7fa4d87eae36f5045acc0af939c0acfbc019628
                                 EventBus.getDefault().post(new MessageEvent(null, Constants.EVENT_MGR_PATIENTUPDATE));
                             }
                         }