From c6c494a28db7dc632912b748016d2eaae47edb36 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Mon, 21 Aug 2017 10:01:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-3721=20=E5=8A=A0=E4=B8=AA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=82=B9=E6=A3=80=E6=B5=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/errorinfo/ErrorInfoUploader.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java index 7865f6d52..a3033ee88 100644 --- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java +++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.errorinfo; import com.fr.base.FRContext; +import com.fr.base.FRCoreContext; import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.json.JSONException; @@ -27,6 +28,7 @@ public class ErrorInfoUploader { public static final String FOLDER_NAME = "errorInfo"; private static ErrorInfoUploader collector; + private static boolean licSupport = true; static { GeneralContext.addEnvChangedListener(new EnvChangedListener() { @@ -35,6 +37,9 @@ public class ErrorInfoUploader { FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender()); } }); + + // 这个控制没啥意义, 主要在于宣传功能. + licSupport = VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support(); } private ErrorInfoUploader() { @@ -51,6 +56,11 @@ public class ErrorInfoUploader { // 从云中心更新最新的解决方案文件 private void checkUpdateSolution(){ + if (!licSupport) { + return; + } + + Thread updateThread = new Thread(new Runnable() { @Override public void run() { From 66fc37a0f226eda2a3ca069a4889bbc055e4d781 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Mon, 21 Aug 2017 10:01:35 +0800 Subject: [PATCH 2/5] 1 --- build.dev.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.dev.gradle b/build.dev.gradle index 1efdd55cc..4add13aff 100644 --- a/build.dev.gradle +++ b/build.dev.gradle @@ -3,7 +3,7 @@ tasks.withType(JavaCompile){ options.encoding = "UTF-8" } -def basicDir="../../" +def basicDir="../../ " def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.*.gradle") From e7132750d64795050329e6a6e3db85f858e1d68c Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Mon, 21 Aug 2017 10:01:59 +0800 Subject: [PATCH 3/5] 1 --- build.dev.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.dev.gradle b/build.dev.gradle index 4add13aff..1efdd55cc 100644 --- a/build.dev.gradle +++ b/build.dev.gradle @@ -3,7 +3,7 @@ tasks.withType(JavaCompile){ options.encoding = "UTF-8" } -def basicDir="../../ " +def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.*.gradle") From d4de2ea2c82c38a4bcc5266530c36121f8e40b8f Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 21 Aug 2017 10:09:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/UIDefaultTheme.java | 4 ++-- .../com/fr/design/images/buttonicon/minus.png | Bin 148 -> 177 bytes .../com/fr/design/images/buttonicon/plus.png | Bin 172 -> 165 bytes .../src/com/fr/start/BaseDesigner.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/UIDefaultTheme.java b/designer_base/src/com/fr/design/gui/UIDefaultTheme.java index 7a9a523fc..ae18ce654 100644 --- a/designer_base/src/com/fr/design/gui/UIDefaultTheme.java +++ b/designer_base/src/com/fr/design/gui/UIDefaultTheme.java @@ -170,8 +170,8 @@ public class UIDefaultTheme extends DefaultMetalTheme { table.put("Tree.textForeground", ThemeUtils.NORMAL_FOREGROUND); table.put("Tree.selectionBackground", ThemeUtils.TEXT_SELECTED_BG_COLOR); table.put("Tree.selectionForeground", ThemeUtils.TEXT_SELECTED_TEXT_COLOR); - table.put("Tree.hash", new ColorUIResource(208, 205, 190)); - table.put("Tree.line", new ColorUIResource(208, 205, 190)); + table.put("Tree.hash", new ColorUIResource(240, 240,243)); + table.put("Tree.line", new ColorUIResource(240, 240,243)); } diff --git a/designer_base/src/com/fr/design/images/buttonicon/minus.png b/designer_base/src/com/fr/design/images/buttonicon/minus.png index 569e998491d9abb662bc63d42794b375b165e03d..4c428c07bc2b7f4aa2a7dbfa8a1ab7ded9ad0cbc 100644 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}*`6+rAsV8| z2@<~=1fR90o}MPkd~=_HozdA7Cw{cgoolP5q47eL+lNVG$G89g|L=6zXXC@una85Z z_VJ-vgT?9T`r!;&RtzbJOc{BzdU|?t7`hr6yVxdhY*H&ZDxe$TF+pv?e69^1yl#pN Ysu7Bk4i_)!01|%O$WD@{VjKx9jP7LeL$-D$|{5)M8LnI`V zZ7M(A31e&fAID?C_}EPC50``0|7u22K{gl7q{f+xmoGnh;NU^V$3}mCd~AMrX=!$X uU5ua)!#b``$0?;pw36<$r5Kq#3u7qM6zXqqktEO?%p6k4yeVmpRDq`3b)IL;&c~%!v+QhQc=tnTYhQZoa-dZV Mp00i_>zopr01vS{RsaA1 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VjKx9jP7LeL$-D$|(mY)pLnI`V zZ7M(A31e&fAID?C_}EPC50``0|7u3jg-o`#x*?1T{LX^x?CfnyVly~Su*_gGHdbzv zx34pZ*;T@;!yC>b%%Eve`bx$}f5x#5d?`#;2Lf1(1tS#$1RtBFFzUQn%TTjd+VN0G ROEb_$22WQ%mvv4FO#ttNE=T|X diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index c393237a7..e2c3a717d 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -93,7 +93,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { initDefaultFont(); //PluginManager要在环境切换和模块启动之前初始化 - PluginManager.registerEnvListener(); +// PluginManager.registerEnvListener(); // 必须先初始化Env再去startModule, 不然会导致lic读取不到 ModuleContext.startModule(module2Start()); From 611702cb73a1663661dedf00f4e43d7da2efa36f Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 21 Aug 2017 10:45:51 +0800 Subject: [PATCH 5/5] tmp --- designer_base/src/com/fr/start/BaseDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index e2c3a717d..c393237a7 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -93,7 +93,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { initDefaultFont(); //PluginManager要在环境切换和模块启动之前初始化 -// PluginManager.registerEnvListener(); + PluginManager.registerEnvListener(); // 必须先初始化Env再去startModule, 不然会导致lic读取不到 ModuleContext.startModule(module2Start());