++
This commit is contained in:
@@ -4,5 +4,7 @@ public class VersionInfo_json {
|
||||
@Expose
|
||||
public int version;
|
||||
@Expose
|
||||
public String date;
|
||||
public String build_date;
|
||||
@Expose
|
||||
public String build_time;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import Common.Passes.PassException;
|
||||
import Common.Utils.Pair;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.UI;
|
||||
import _VisualDVM.ComponentsServer.Component.Json.VersionInfo_json;
|
||||
import _VisualDVM.ComponentsServer.Component.OSDComponent;
|
||||
import _VisualDVM.Constants;
|
||||
import _VisualDVM.Global;
|
||||
@@ -416,12 +417,9 @@ public abstract class Sapfor extends OSDComponent {
|
||||
public void GetVersionInfo() {
|
||||
try {
|
||||
RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", "");
|
||||
//заглушка.
|
||||
version = 6666;
|
||||
date_text = new Date().toString();
|
||||
// VersionInfo_json versionInfo_json =
|
||||
// UI.Info("sapfor version info");
|
||||
// Visualizer_2.UnpackVersionInfo(this, getResult());
|
||||
VersionInfo_json versionInfo_json = Utils_.gson.fromJson(getResult(),VersionInfo_json.class);
|
||||
version = versionInfo_json.version;
|
||||
date_text = versionInfo_json.build_date+" "+ versionInfo_json.build_time;
|
||||
} catch (Exception e) {
|
||||
Utils_.MainLog.PrintException(e);
|
||||
UI.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription()));
|
||||
@@ -503,9 +501,7 @@ public abstract class Sapfor extends OSDComponent {
|
||||
this.predictorStats = predictorStats;
|
||||
}
|
||||
public void decodeString(String runResult) throws Exception {
|
||||
System.out.println("String="+runResult);
|
||||
SapforResult_json resultJson = Utils_.gson.fromJson(runResult, SapforResult_json.class);
|
||||
resultJson.Print();
|
||||
//---
|
||||
setErrorCode(resultJson.errorCode);
|
||||
setOutput(resultJson.output);
|
||||
|
||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1257;
|
||||
public static final int version = 1258;
|
||||
public static final int planner_version = 24;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
|
||||
Reference in New Issue
Block a user