<修改APP检查流程，兼容旧版本服务器>

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <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>

app/build.gradle

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

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

@@ -105,7 +105,7 @@ public class APPUpdateActivity extends BaseActivity implements SilentUpdateUtil.
 //                    } else {
 //                        downloadUtils.installAPK(DownloadUtil.FILE_APK_PATH + "/" + DownloadUtil.FILE_APK_NAME); //智能升级
 //                    }
-//                    APPUpdateActivity.this.finish();
+                    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(object.getString("APPVersion"));
+                                float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
                                 float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(CallingDoorActivity.this));
                                 String downloadURL = object.getString("downloadURL");
                                 if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
@@ -999,12 +999,12 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                         }
                         if (udpEntity.getIndexes().equals("call_1")) {
                             //============接收全部床头机呼叫udp============
-                            if(udpEntity.getDoorwayMachineID().equals(Constants.MYSELF_ID)){
+                            //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(object.getString("APPVersion"));
+                                float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
                                 float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(InitActivity.this));
                                 String downloadURL = object.getString("downloadURL");
                                 if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功