<修改版本升级检查>

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

@@ -639,13 +639,13 @@ 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_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(CallingDoorActivity.this));
+                                String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
+                                String APPVersion_Now = StringUtils.getAppVersionName(CallingDoorActivity.this);
                                 String downloadURL = object.getString("downloadURL");
-                                if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
+                                if (!APPVersion_Now.equals(APPVersion)) {//本来是“<”的；但有个别机器老是不升级成功
                                     if (StringUtils.notEmpty(downloadURL)) {
+                                        ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
                                         closeHeart();//关闭心跳
-                                        DownloadUtil.APP_VERSION = APPVersion;
                                         Intent intent = new Intent(CallingDoorActivity.this, APPUpdateActivity.class);
                                         //intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                         intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + downloadURL);

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

@@ -469,13 +469,13 @@ 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_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(InitActivity.this));
+                                String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
+                                String APPVersion_Now = StringUtils.getAppVersionName(InitActivity.this);
                                 String downloadURL = object.getString("downloadURL");
-                                if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
+                                ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
+                                if (!APPVersion_Now.equals(APPVersion)) {//本来是“<”的；但有个别机器老是不升级成功
                                     if (StringUtils.notEmpty(downloadURL)) {
                                         closeHeart();//关闭心跳
-                                        DownloadUtil.APP_VERSION = APPVersion;
                                         Intent intent = new Intent(InitActivity.this, APPUpdateActivity.class);
                                         //intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                         intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + downloadURL);