修改app更新逻辑 2修改门口机不能正常语音播报问题 3修改门口机不能实时更新分机问题

.idea/codeStyles/Project.xml

@@ -1,113 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/gradle.xml

@@ -14,7 +14,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,45 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="12">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="android.annotation.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="11">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="android.annotation.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/AmDemo_R/AmDemo_R.iml" filepath="$PROJECT_DIR$/AmDemo_R/AmDemo_R.iml" />
+      <module fileurl="file://$PROJECT_DIR$/CallingDoor_center.iml" filepath="$PROJECT_DIR$/CallingDoor_center.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/callingdoor.iml" filepath="$PROJECT_DIR$/callingdoor.iml" />
       <module fileurl="file://$PROJECT_DIR$/nurseMainLib/nurseMainLib.iml" filepath="$PROJECT_DIR$/nurseMainLib/nurseMainLib.iml" />
     </modules>
   </component>

app/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.45"
+        versionName "1.47"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingdoor/common/Constants.java

@@ -22,7 +22,8 @@ public class Constants {
     //网管地址
     public static String URL = "";
     //端口号
-    public static final String URL_END = ":81/";
+//    public static final String URL_END = ":81/";
+    public static final String URL_END = ":8005/";
     /**
      * sip端口号
      */

app/src/main/java/com/wdkl/callingdoor/ui/APPUpdateActivity.java

@@ -98,14 +98,14 @@ public class APPUpdateActivity extends BaseActivity implements SilentUpdateUtil.
                     text_download_infomation.setText("程序正在安装中请勿断电！");
                     //升级
                     DownloadUtils downloadUtils = new DownloadUtils(APPUpdateActivity.this);
-                    if (Build.VERSION.SDK_INT >= 26) {
+//                    if (Build.VERSION.SDK_INT >= 26) {
                         if (downloadUtils.silentInstall(DownloadUtil.FILE_APK_PATH + "/" + DownloadUtil.FILE_APK_NAME)) {
                             ToastUtil.showToast("升级成功，即将重启！");
                         }
-                    } else {
-                        downloadUtils.installAPK(DownloadUtil.FILE_APK_PATH + "/" + DownloadUtil.FILE_APK_NAME); //智能升级
-                    }
-                    APPUpdateActivity.this.finish();
+//                    } else {
+//                        downloadUtils.installAPK(DownloadUtil.FILE_APK_PATH + "/" + DownloadUtil.FILE_APK_NAME); //智能升级
+//                    }
+//                    APPUpdateActivity.this.finish();
                     break;
                 case APP_UPDATE_ING:
                     int progress = (int) msg.obj;

app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -622,7 +622,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                         try {
                             JSONObject object = new JSONObject(data);
                             if (object.getString("Code").equals("OK!")) {
-                                float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
+                                float APPVersion = StringUtils.parseFloat(object.getString("APPVersion"));
                                 float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(CallingDoorActivity.this));
                                 String downloadURL = object.getString("downloadURL");
                                 if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
@@ -991,15 +991,20 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                     case "call_2"://卫生间呼叫护士主机
                     case "call_4"://增援呼叫护士主机
                     case "call_6": //门口机呼叫护士主机
-                        /*if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
-                            addPhonetics(udpEntity); //在此加入列表队列 Waderson  20171101
-                        }*/
 
+                        if(udpEntity.getDoorwayMachineID().equals(Constants.MYSELF_ID)) {
+                            if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
+                                addPhonetics(udpEntity); //在此加入列表队列 Waderson  20171101
+                            }
+                        }
                         if (udpEntity.getIndexes().equals("call_1")) {
                             //============接收全部床头机呼叫udp============
+                            if(udpEntity.getDoorwayMachineID().equals(Constants.MYSELF_ID)){
+
                             if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")) {
                                 mGroupAdapter.updateData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "呼叫");
                             }
+                            }
                         }
                         if (udpEntity.getIndexes().equals("call_2")) {
                             //============接收全部床头机呼叫udp============

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

@@ -461,7 +461,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                         try {
                             JSONObject object = new JSONObject(data);
                             if (object.getString("Code").equals("OK!")) {
-                                float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
+                                float APPVersion = StringUtils.parseFloat(object.getString("APPVersion"));
                                 float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(InitActivity.this));
                                 String downloadURL = object.getString("downloadURL");
                                 if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功

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

@@ -1,6 +1,7 @@
 package com.wdkl.callingdoor.util;
 
 import android.content.Context;
+import android.util.Log;
 
 import com.wdkl.callingdoor.MyApplication;
 import com.wdkl.callingdoor.common.Constants;
@@ -261,10 +262,10 @@ public class AnalysisUdpUtil {
                         }
                         break;
                     case "MGR_SYSTEM_RESET"://系统重启
-                        //if (data[1].equals(Constants.MAC_ADDRESS)) {
+                        if (data[1].equals(Constants.MAC_ADDRESS)) {
                             //MyApplication.serialPortUtil.systemRestart();//调用吴总串口
                             AutoRebootUtil.reboot();//调用Linux-shell命令
-                        //}
+                        }
                         break;
                     //给出设备信息
                     case "MGR_REG_Q":
@@ -312,9 +313,10 @@ public class AnalysisUdpUtil {
                         break;
                     case "MGR_PATIENTUPDATE": //后台数据改变刷新UI
                         //if (data[1].equals(Constants.MYSELF_ID)) {
-                            if (!Constants.UPDATE_PATIENTUPDATE_FLAG) {
-                                Constants.UPDATE_PATIENTUPDATE_FLAG = true;
-                                LogUtil.d("MGR_PATIENTUPDATE", "MGR_PATIENTUPDATE");
+//                            if (!Constants.UPDATE_PATIENTUPDATE_FLAG) {
+//                                Constants.UPDATE_PATIENTUPDATE_FLAG = true;
+                        if (data[1].equals(Constants.MAC_ADDRESS)) {
+                               Log.d("MGR_PATIENTUPDATE", "MGR_PATIENTUPDATE");
                                 EventBus.getDefault().post(new MessageEvent(null, Constants.EVENT_MGR_PATIENTUPDATE));
                             }
                         //}