diff --git a/cef/cef-def.go b/cef/cef-def.go new file mode 100644 index 0000000000000000000000000000000000000000..e4e99064d9d298ece2b7f17ff48c11cf9816212a --- /dev/null +++ b/cef/cef-def.go @@ -0,0 +1,37 @@ +//---------------------------------------- +// +// Copyright © yanghy. All Rights Reserved. +// +// Licensed under GNU General Public License v3.0 +// +//---------------------------------------- + +package cef + +import ( + "github.com/energye/energy/common" + "github.com/energye/golcl/lcl/api" +) + +var ( + cef_version string + lib_build_version string +) + +//cef version +func CEFVersion() string { + if cef_version == "" { + r1, _, _ := common.Proc(internale_CEFVersion).Call() + cef_version = api.GoStr(r1) + } + return cef_version +} + +//lib build version +func LibBuildVersion() string { + if lib_build_version == "" { + r1, _, _ := common.Proc(internale_LibBuildVersion).Call() + lib_build_version = api.GoStr(r1) + } + return lib_build_version +} diff --git a/cef/cef-proc-def.go b/cef/cef-proc-def.go index 5226bddefba6ca49cc8f7e4ab5aaba04201d6b52..866d0dc4aebb027e3f334c0a5058c27e814b452c 100644 --- a/cef/cef-proc-def.go +++ b/cef/cef-proc-def.go @@ -14,6 +14,8 @@ func init() { var energyImportDefs = []*dllimports.ImportTable{ //null nil dllimports.NewEnergyImport("", 0), + dllimports.NewEnergyImport("CEFVersion", 0), + dllimports.NewEnergyImport("LibBuildVersion", 0), //ApplicationQueueAsyncCallFunc dllimports.NewEnergyImport("SetApplicationQueueAsyncCallFunc", 0), dllimports.NewEnergyImport("CEFApplication_QueueAsyncCall", 0), @@ -344,6 +346,8 @@ func init() { const ( //null nil internale_null_nil = iota + internale_CEFVersion + internale_LibBuildVersion //ApplicationQueueAsyncCallFunc internale_SetApplicationQueueAsyncCallFunc internale_CEFApplication_QueueAsyncCall diff --git a/example/mini-browser/MiniBrowser.go b/example/mini-browser/MiniBrowser.go index bd4719d4fb4febb856d0f4ae0306bf0c92dccf82..b68e22bda6480b748b32aca54b38a0a9729a16a2 100644 --- a/example/mini-browser/MiniBrowser.go +++ b/example/mini-browser/MiniBrowser.go @@ -23,6 +23,7 @@ func main() { //环境变量 ENERGY_HOME="/app/cefframework" 配置框架所在目录 //全局初始化 cef.GlobalCEFInit(&libs, &resources) + fmt.Println("CEFVersion:", cef.CEFVersion(), "LibBuildVersion:", cef.LibBuildVersion()) //Render 子进程一些初始化配置 cefApp := src.AppRenderInit() //Browser 主进程一些初始配置