|
@@ -26,6 +26,7 @@ import android.support.design.widget.Snackbar;
|
|
import android.support.v4.content.ContextCompat;
|
|
import android.support.v4.content.ContextCompat;
|
|
import android.support.v7.widget.RecyclerView;
|
|
import android.support.v7.widget.RecyclerView;
|
|
import android.text.TextUtils;
|
|
import android.text.TextUtils;
|
|
|
|
+import android.util.Log;
|
|
import android.view.Gravity;
|
|
import android.view.Gravity;
|
|
import android.view.MotionEvent;
|
|
import android.view.MotionEvent;
|
|
import android.view.View;
|
|
import android.view.View;
|
|
@@ -1287,11 +1288,13 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
|
|
String APPVersion = StringUtils.deleteCharAt(object.getString("APPVersion"), 0);
|
|
String APPVersion_Now = StringUtils.getAppVersionName(CallingBedActivity.this);
|
|
String APPVersion_Now = StringUtils.getAppVersionName(CallingBedActivity.this);
|
|
String downloadURL = object.getString("downloadURL");
|
|
String downloadURL = object.getString("downloadURL");
|
|
|
|
+ LogUtil.d("appCheckUpdate", "当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
|
|
if (!APPVersion_Now.equals(APPVersion)) {
|
|
if (!APPVersion_Now.equals(APPVersion)) {
|
|
if (StringUtils.notEmpty(downloadURL)) {
|
|
if (StringUtils.notEmpty(downloadURL)) {
|
|
ToastUtil.showToast("开始下载! 当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
|
|
ToastUtil.showToast("开始下载! 当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
|
|
closeHeart();//关闭心跳
|
|
closeHeart();//关闭心跳
|
|
Intent intent = new Intent(CallingBedActivity.this, APPUpdateActivity.class);
|
|
Intent intent = new Intent(CallingBedActivity.this, APPUpdateActivity.class);
|
|
|
|
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
|
|
intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
|
|
startActivity(intent);
|
|
startActivity(intent);
|
|
} else {
|
|
} else {
|