Browse Source

Pull request #2056: REPORT-37235 版本规范-更新升级弹窗提示版本号不符合规范

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit 'aa8b671b35b0b44be56b9438cb9e8380b6c5eaa5':
  REPORT-37235 版本规范-更新升级弹窗提示版本号不符合规范
feature/big-screen
Henry.Wang 4 years ago
parent
commit
83144ace1d
  1. 8
      designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java
  2. 2
      designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css

8
designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java

@ -24,6 +24,7 @@ class DesignerUpdateInfo {
private final String currentVersion; // 当前版本
private final String latestVersion; // 最新版本
private final String latestFullVersion; // 最新版本的完整信息
private final String lastIgnoredVersion; // 最近一次跳过的版本
private final String pushVersion; // 推送版本
@ -34,6 +35,7 @@ class DesignerUpdateInfo {
DesignerUpdateInfo(String currentVersion, String latestVersion, String lastIgnoredVersion, JSONObject pushData) {
this.currentVersion = currentVersion;
this.latestVersion = latestVersion;
this.latestFullVersion = initLatestFullVersion();
this.lastIgnoredVersion = lastIgnoredVersion;
this.pushVersion = pushData.optString(KEY_VERSION);
@ -65,7 +67,7 @@ class DesignerUpdateInfo {
return latestVersion;
}
String getLatestFullVersion() {
String initLatestFullVersion() {
try {
String url = CloudCenter.getInstance().acquireUrlByKind("jar10.new.update");
if (StringUtils.isBlank(url)) {
@ -85,6 +87,10 @@ class DesignerUpdateInfo {
return StringUtils.EMPTY;
}
String getLatestFullVersion() {
return latestFullVersion;
}
String getLastIgnoredVersion() {
return lastIgnoredVersion;
}

2
designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css

@ -1,6 +1,6 @@
body {
padding-left: 30px;
padding-top: 30px;
padding-top: 25px;
color: white;
background-size: 100% 100% !important;
-moz-background-size: 100% 100% !important;

Loading…
Cancel
Save