<修改版本升级检查>

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

@@ -1065,14 +1065,14 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             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(CallingBedActivity.this));
+                                    String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
+                                    String APPVersion_Now = StringUtils.getAppVersionName(CallingBedActivity.this);
                                     String downloadURL = object.getString("downloadURL");
-                                    Log.e(TAG,"appCheckUpdate() 服务器返回版本 "+APPVersion+" 设备当前版本 "+APPVersion_Now);
-                                    if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
+                                    //Log.e(TAG,"appCheckUpdate() 服务器返回版本 "+APPVersion+" 设备当前版本 "+APPVersion_Now);
+                                    ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
+                                    if (!APPVersion_Now.equals(APPVersion)) {//本来是“<”的；但有个别机器老是不升级成功
                                         if (StringUtils.notEmpty(downloadURL)) {
                                             closeHeart();//关闭心跳
-                                            DownloadUtil.APP_VERSION = APPVersion;
                                             Intent intent = new Intent(CallingBedActivity.this, APPUpdateActivity.class);
                                             intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                             startActivity(intent);

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

@@ -239,14 +239,14 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
                             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));
-                                    Log.e(TAG,"appCheckUpdate() 服务器返回版本 "+APPVersion+" 设备当前版本 "+APPVersion_Now);
+                                    String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
+                                    String APPVersion_Now = StringUtils.getAppVersionName(InitActivity.this);
+                                    //Log.e(TAG,"appCheckUpdate() 服务器返回版本 "+APPVersion+" 设备当前版本 "+APPVersion_Now);
+                                    ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
                                     String downloadURL = object.getString("downloadURL");
-                                    if (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);
                                             startActivity(intent);