<修改版本升级检查>

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/InitActivity.java

@@ -444,15 +444,15 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                                 JSONObject object = new JSONObject(data);
                                 if (object.getString("Code").equals("OK!")) {
                                     LogUtil.d("appCheckUpdate", "4===object==" + object.toString());
-                                    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) { //本来是“<”的；但有个别机器老是不升级成功
-                                        LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
+                                    if (!APPVersion_Now.equals(APPVersion)) { //本来是“<”的；但有个别机器老是不升级成功
+                                        //LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion + ", APPVersion_Now==" + APPVersion_Now);
                                         if (StringUtils.notEmpty(downloadURL)) {
-                                            LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);
+                                            //LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);
+                                            ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
                                             closeHeart();//关闭心跳
-                                            DownloadUtil.APP_VERSION = APPVersion;
                                             Intent intent = new Intent(InitActivity.this, APPUpdateActivity.class);
                                             intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                             startActivity(intent);

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/MainFragmentActivity.java

@@ -435,16 +435,15 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                                 JSONObject object = new JSONObject(data);
                                 if (object.getString("Code").equals("OK!")) {
                                     LogUtil.d("appCheckUpdate", "4===object==" + object.toString());
-                                    float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
-                                    float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(MainFragmentActivity.this));
+                                    String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
+                                    String APPVersion_Now = StringUtils.getAppVersionName(MainFragmentActivity.this);
                                     String downloadURL = object.getString("downloadURL");
-
-                                    if (APPVersion_Now != APPVersion) { //本来是“<”的；但有个别机器老是不升级成功
-                                        LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
+                                    if (!APPVersion_Now.equals(APPVersion)) { //本来是“<”的；但有个别机器老是不升级成功
+                                        //LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
                                         if (StringUtils.notEmpty(downloadURL)) {
-                                            LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);
+                                            //LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);
+                                            ToastUtil.showToast("当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
                                             closeHeart();//关闭心跳
-                                            DownloadUtil.APP_VERSION = APPVersion;
                                             Intent intent = new Intent(MainFragmentActivity.this, APPUpdateActivity.class);
                                             intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                             startActivity(intent);