Browse Source

Merge branch 'release/10.0' of https://code.fineres.com/scm/~yuan.wang/design into release/10.0

feature/big-screen
Yuan.Wang 4 years ago
parent
commit
1d5ca3891d
  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 currentVersion; // 当前版本
private final String latestVersion; // 最新版本 private final String latestVersion; // 最新版本
private final String latestFullVersion; // 最新版本的完整信息
private final String lastIgnoredVersion; // 最近一次跳过的版本 private final String lastIgnoredVersion; // 最近一次跳过的版本
private final String pushVersion; // 推送版本 private final String pushVersion; // 推送版本
@ -34,6 +35,7 @@ class DesignerUpdateInfo {
DesignerUpdateInfo(String currentVersion, String latestVersion, String lastIgnoredVersion, JSONObject pushData) { DesignerUpdateInfo(String currentVersion, String latestVersion, String lastIgnoredVersion, JSONObject pushData) {
this.currentVersion = currentVersion; this.currentVersion = currentVersion;
this.latestVersion = latestVersion; this.latestVersion = latestVersion;
this.latestFullVersion = initLatestFullVersion();
this.lastIgnoredVersion = lastIgnoredVersion; this.lastIgnoredVersion = lastIgnoredVersion;
this.pushVersion = pushData.optString(KEY_VERSION); this.pushVersion = pushData.optString(KEY_VERSION);
@ -65,7 +67,7 @@ class DesignerUpdateInfo {
return latestVersion; return latestVersion;
} }
String getLatestFullVersion() { String initLatestFullVersion() {
try { try {
String url = CloudCenter.getInstance().acquireUrlByKind("jar10.new.update"); String url = CloudCenter.getInstance().acquireUrlByKind("jar10.new.update");
if (StringUtils.isBlank(url)) { if (StringUtils.isBlank(url)) {
@ -85,6 +87,10 @@ class DesignerUpdateInfo {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
String getLatestFullVersion() {
return latestFullVersion;
}
String getLastIgnoredVersion() { String getLastIgnoredVersion() {
return lastIgnoredVersion; return lastIgnoredVersion;
} }

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

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

Loading…
Cancel
Save