mirror of
https://gitee.com/energye/energy.git
synced 2024-12-02 11:47:37 +08:00
upgrade-dev v2.1.29
This commit is contained in:
杨红岩
parent
bc440d9e05
commit
2cb99c1952
@ -467,11 +467,15 @@ func (m *ICefV8Value) GetFunctionHandler() *ICefV8Handler {
|
||||
|
||||
func (m *ICefV8Value) ExecuteFunction(obj *ICefV8Value, arguments *TCefV8ValueArray) *ICefV8Value {
|
||||
var result uintptr
|
||||
var args = make([]uintptr, arguments.Size(), arguments.Size())
|
||||
for i, a := range arguments.argumentsCollect {
|
||||
args[i] = a.Instance()
|
||||
var ptr uintptr
|
||||
if arguments.Size() > 0 {
|
||||
var args = make([]uintptr, arguments.Size(), arguments.Size())
|
||||
for i, a := range arguments.argumentsCollect {
|
||||
args[i] = a.Instance()
|
||||
}
|
||||
ptr = uintptr(unsafe.Pointer(&args[0]))
|
||||
}
|
||||
imports.Proc(internale_CefV8Value_ExecuteFunction).Call(m.Instance(), obj.Instance(), uintptr(unsafe.Pointer(&result)), uintptr(unsafe.Pointer(&args[0])), uintptr(int32(arguments.Size())))
|
||||
imports.Proc(internale_CefV8Value_ExecuteFunction).Call(m.Instance(), obj.Instance(), uintptr(unsafe.Pointer(&result)), ptr, uintptr(int32(arguments.Size())))
|
||||
return &ICefV8Value{
|
||||
instance: unsafe.Pointer(result),
|
||||
}
|
||||
@ -479,11 +483,15 @@ func (m *ICefV8Value) ExecuteFunction(obj *ICefV8Value, arguments *TCefV8ValueAr
|
||||
|
||||
func (m *ICefV8Value) ExecuteFunctionWithContext(v8Context *ICefV8Context, obj *ICefV8Value, arguments *TCefV8ValueArray) *ICefV8Value {
|
||||
var result uintptr
|
||||
var args = make([]uintptr, arguments.Size(), arguments.Size())
|
||||
for i, a := range arguments.argumentsCollect {
|
||||
args[i] = a.Instance()
|
||||
var ptr uintptr
|
||||
if arguments.Size() > 0 {
|
||||
var args = make([]uintptr, arguments.Size(), arguments.Size())
|
||||
for i, a := range arguments.argumentsCollect {
|
||||
args[i] = a.Instance()
|
||||
}
|
||||
ptr = uintptr(unsafe.Pointer(&args[0]))
|
||||
}
|
||||
imports.Proc(internale_CefV8Value_ExecuteFunctionWithContext).Call(m.Instance(), v8Context.Instance(), obj.Instance(), uintptr(unsafe.Pointer(&result)), uintptr(unsafe.Pointer(&args[0])), uintptr(int32(arguments.Size())))
|
||||
imports.Proc(internale_CefV8Value_ExecuteFunctionWithContext).Call(m.Instance(), v8Context.Instance(), obj.Instance(), uintptr(unsafe.Pointer(&result)), ptr, uintptr(int32(arguments.Size())))
|
||||
return &ICefV8Value{
|
||||
instance: unsafe.Pointer(result),
|
||||
}
|
||||
|
||||
@ -20,61 +20,170 @@ import (
|
||||
"reflect"
|
||||
)
|
||||
|
||||
func goValueConvert(result *ICefListValue, i types.NativeUInt, value interface{}) {
|
||||
switch value.(type) {
|
||||
case bool:
|
||||
result.SetBool(i, value.(bool))
|
||||
case float32:
|
||||
result.SetDouble(i, float64(value.(float32)))
|
||||
case float64:
|
||||
result.SetDouble(i, value.(float64))
|
||||
case string:
|
||||
result.SetString(i, value.(string))
|
||||
case int:
|
||||
result.SetInt(i, int32(value.(int)))
|
||||
case int8:
|
||||
result.SetInt(i, int32(value.(int8)))
|
||||
case int16:
|
||||
result.SetInt(i, int32(value.(int16)))
|
||||
case int32:
|
||||
result.SetInt(i, value.(int32))
|
||||
case int64:
|
||||
result.SetString(i, fmt.Sprintf("%d", value.(int64)))
|
||||
case uint:
|
||||
result.SetInt(i, int32(value.(uint)))
|
||||
case uint8:
|
||||
result.SetInt(i, int32(value.(uint8)))
|
||||
case uint16:
|
||||
result.SetInt(i, int32(value.(uint16)))
|
||||
case uint32:
|
||||
result.SetInt(i, int32(value.(uint32)))
|
||||
case uint64:
|
||||
result.SetString(i, fmt.Sprintf("%d", value.(uint64)))
|
||||
default:
|
||||
result.SetNull(i)
|
||||
}
|
||||
}
|
||||
|
||||
//goValueToListValue GoValue 转换 ICefListValue
|
||||
func goValueToListValue(data []interface{}) (*ICefListValue, error) {
|
||||
if data == nil {
|
||||
return nil, errors.New("build process message error. Parameter null")
|
||||
}
|
||||
result := ListValueRef.New()
|
||||
var result = ListValueRef.New()
|
||||
|
||||
for i, value := range data {
|
||||
var kind reflect.Kind
|
||||
switch value.(type) {
|
||||
case reflect.Type:
|
||||
kind = value.(reflect.Type).Kind()
|
||||
case reflect.Kind:
|
||||
kind = value.(reflect.Kind)
|
||||
default:
|
||||
kind = reflect.TypeOf(value).Kind()
|
||||
}
|
||||
switch kind {
|
||||
case reflect.String:
|
||||
result.SetString(types.NativeUInt(i), value.(string))
|
||||
case reflect.Int:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(int)))
|
||||
case reflect.Int8:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(int8)))
|
||||
case reflect.Int16:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(int16)))
|
||||
case reflect.Int32:
|
||||
result.SetInt(types.NativeUInt(i), value.(int32))
|
||||
case reflect.Int64:
|
||||
result.SetString(types.NativeUInt(i), fmt.Sprintf("%d", value.(int64)))
|
||||
case reflect.Uint:
|
||||
result.SetInt(types.NativeUInt(i), value.(int32))
|
||||
case reflect.Uint8:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(uint8)))
|
||||
case reflect.Uint16:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(uint16)))
|
||||
case reflect.Uint32:
|
||||
result.SetInt(types.NativeUInt(i), int32(value.(uint32)))
|
||||
case reflect.Uint64:
|
||||
result.SetString(types.NativeUInt(i), fmt.Sprintf("%d", value.(uint64)))
|
||||
case reflect.Float32:
|
||||
result.SetDouble(types.NativeUInt(i), float64(value.(float32)))
|
||||
case reflect.Float64:
|
||||
result.SetDouble(types.NativeUInt(i), value.(float64))
|
||||
case reflect.Bool:
|
||||
result.SetBool(types.NativeUInt(i), value.(bool))
|
||||
var typeOf = reflect.TypeOf(value)
|
||||
switch typeOf.Kind() {
|
||||
case reflect.Struct: // object
|
||||
fmt.Println("goValueToListValue Struct")
|
||||
case reflect.Slice: // array
|
||||
fmt.Println("goValueToListValue Slice")
|
||||
switch value.(type) {
|
||||
case []bool:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]bool) {
|
||||
list.SetBool(types.NativeUInt(i), v)
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []float32:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]float32) {
|
||||
list.SetDouble(types.NativeUInt(i), float64(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []float64:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]float64) {
|
||||
list.SetDouble(types.NativeUInt(i), v)
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []string:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]string) {
|
||||
list.SetString(types.NativeUInt(i), v)
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []int:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]int) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []int8:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]int8) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []int16:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]int16) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []int32:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]int32) {
|
||||
list.SetInt(types.NativeUInt(i), v)
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []int64:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]int64) {
|
||||
list.SetString(types.NativeUInt(i), fmt.Sprintf("%d", v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []uint:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]uint) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []uint8:
|
||||
BinaryValueRef.New(value.([]byte))
|
||||
result.SetBinary(types.NativeUInt(i), BinaryValueRef.New(value.([]byte)))
|
||||
case []uint16:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]uint16) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []uint32:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]uint32) {
|
||||
list.SetInt(types.NativeUInt(i), int32(v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []uint64:
|
||||
var list = ListValueRef.New()
|
||||
for i, v := range value.([]uint64) {
|
||||
list.SetString(types.NativeUInt(i), fmt.Sprintf("%d", v))
|
||||
}
|
||||
result.SetList(types.NativeUInt(i), list)
|
||||
case []interface{}:
|
||||
if v, err := goValueToListValue(value.([]interface{})); err == nil {
|
||||
result.SetList(types.NativeUInt(i), v)
|
||||
} else {
|
||||
result.SetList(types.NativeUInt(i), ListValueRef.New())
|
||||
}
|
||||
default:
|
||||
fmt.Println("goValueToListValue []struct")
|
||||
}
|
||||
case reflect.Map: // object
|
||||
fmt.Println("goValueToListValue Map")
|
||||
default:
|
||||
result.SetNull(types.NativeUInt(i))
|
||||
fmt.Println("goValueToListValue default", value)
|
||||
goValueConvert(result, types.NativeUInt(i), value)
|
||||
}
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
//goSliceValueToListValue GoStructValue 转换 ICefDictionaryValue
|
||||
func goSliceValueToListValue(data []interface{}) *ICefListValue {
|
||||
result := ListValueRef.New()
|
||||
for i, value := range data {
|
||||
goValueConvert(result, types.NativeUInt(i), value)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
//goStructValueToListValue GoStructValue 转换 ICefDictionaryValue
|
||||
func goStructValueToListValue(data []interface{}) (*ICefDictionaryValue, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
//listValueToV8Value ICefListValue 转换 ICefV8Value
|
||||
func listValueToV8Value(list *ICefListValue) (*ICefV8Value, error) {
|
||||
if list == nil {
|
||||
@ -97,6 +206,7 @@ func listValueToV8Value(list *ICefListValue) (*ICefV8Value, error) {
|
||||
case consts.VTYPE_STRING:
|
||||
newValue = V8ValueRef.NewString(value.GetString())
|
||||
case consts.VTYPE_BINARY: // []byte
|
||||
//newValue = V8ValueRef.NewArrayBuffer(value.GetBinary())
|
||||
case consts.VTYPE_DICTIONARY: // Object
|
||||
if v, err := dictionaryValueToV8Value(value.GetDictionary()); err == nil {
|
||||
newValue = v
|
||||
@ -64,7 +64,10 @@ func main() {
|
||||
value.GetIArray()
|
||||
}
|
||||
}
|
||||
context.Result("asdfsadf", 123123, true, "返回值返回值返回值", 6666.6669)
|
||||
var bytArr = make([]byte, 1024, 1024)
|
||||
var strarr = make([]*src.StructVarDemo, 1024, 1024)
|
||||
var strarr2 = make([]src.StructVarDemo, 1024, 1024)
|
||||
context.Result("asdfsadf", 123123, true, "返回值返回值返回值", 6666.6669, bytArr, strarr, strarr2)
|
||||
})
|
||||
|
||||
cef.VariableBind.Bind("funcName", func(intVar int, stringVar string, doubleVar float64) (string, int, bool) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user