|
@@ -392,6 +392,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
TextView tvVolume;
|
|
|
@Bind(R.id.rv_settings_version)
|
|
|
RecyclerView rvSettings;
|
|
|
+ @Bind(R.id.tv_version)
|
|
|
+ TextView tvVersion;
|
|
|
|
|
|
private ImageView ivWelcome;
|
|
|
private MyTextView tvMessage;
|
|
@@ -651,6 +653,25 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
+ tvVersion.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ showHideRightView();
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ //app update check
|
|
|
+ tvVersion.setOnLongClickListener(new View.OnLongClickListener() {
|
|
|
+ @Override
|
|
|
+ public boolean onLongClick(View v) {
|
|
|
+ //重置回到主界面倒计时
|
|
|
+ timeOfBackMainPage = 0;
|
|
|
+ timeOut = callTimeOutBack;
|
|
|
+ appCheckUpdate();
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -1197,6 +1218,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
@Override
|
|
|
public void onError(Call call, Exception e, int id) {
|
|
|
Constants.UPDATE_APP_FLAG = false;
|
|
|
+ ToastUtil.showToast("检查APP版本失败,请检查网络或服务器配置");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -1216,10 +1238,17 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
Intent intent = new Intent(CallingBedActivity.this, APPUpdateActivity.class);
|
|
|
intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
|
|
|
startActivity(intent);
|
|
|
+ } else {
|
|
|
+ ToastUtil.showToast("APP下载地址为空,请检查服务器配置");
|
|
|
}
|
|
|
+ } else {
|
|
|
+ ToastUtil.showToast("已是最新版本! 当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ ToastUtil.showToast("获取APP版本失败,请检查服务器是否上传新版本");
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
+ ToastUtil.showToast("检查APP版本失败,请检查网络或服务器配置");
|
|
|
e.printStackTrace();
|
|
|
Constants.UPDATE_APP_FLAG = false;
|
|
|
}
|
|
@@ -2327,7 +2356,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
versionAdapter.upDateList(versionEntityList);
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @Override
|
|
|
public void onClick(View v) {
|
|
|
switch (v.getId()) {
|
|
|
case R.id.right_ll_main_item:
|