From 59eed39493243779c6a103187ec703a3e7281243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= Date: Sun, 19 Jan 2020 11:15:06 +0800 Subject: [PATCH] replace javaValues with values --- .../doric/devkit/remote/RemoteJSExecutor.java | 2 +- doric-js/bundle/doric-vm.js | 26 +++++++++---------- doric-js/index.debug.ts | 26 +++++++++---------- doric-js/lib/index.debug.js | 26 +++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/doric-android/devkit/src/main/java/pub/doric/devkit/remote/RemoteJSExecutor.java b/doric-android/devkit/src/main/java/pub/doric/devkit/remote/RemoteJSExecutor.java index 33b6dbaa..d4ff926e 100644 --- a/doric-android/devkit/src/main/java/pub/doric/devkit/remote/RemoteJSExecutor.java +++ b/doric-android/devkit/src/main/java/pub/doric/devkit/remote/RemoteJSExecutor.java @@ -139,7 +139,7 @@ public class RemoteJSExecutor { .put("cmd", "invokeMethod") .put("objectName", objectName) .put("functionName", functionName) - .put("javaValues", jsonArray) + .put("values", jsonArray) .put("hashKey", hashKey) .toString()); diff --git a/doric-js/bundle/doric-vm.js b/doric-js/bundle/doric-vm.js index 73f8301e..501301e5 100644 --- a/doric-js/bundle/doric-vm.js +++ b/doric-js/bundle/doric-vm.js @@ -3817,25 +3817,25 @@ debugServer.on('connection', function connection(ws) { console.log(messageObject.objectName); console.log(messageObject.functionName); let args = []; - for (let i = 0; i < messageObject.javaValues.length; i++) { - let javaValue = messageObject.javaValues[i]; - if (javaValue.type === 0) { + for (let i = 0; i < messageObject.values.length; i++) { + let value = messageObject.values[i]; + if (value.type === 0) { args.push(null); } - else if (javaValue.type === 1) { - args.push(parseFloat(javaValue.value)); + else if (value.type === 1) { + args.push(parseFloat(value.value)); } - else if (javaValue.type === 2) { - args.push((javaValue.value == 'true')); + else if (value.type === 2) { + args.push((value.value == 'true')); } - else if (javaValue.type === 3) { - args.push(javaValue.value.toString()); + else if (value.type === 3) { + args.push(value.value.toString()); } - else if (javaValue.type === 4) { - args.push(JSON.parse(javaValue.value)); + else if (value.type === 4) { + args.push(JSON.parse(value.value)); } - else if (javaValue.type === 5) { - args.push(JSON.parse(javaValue.value)); + else if (value.type === 5) { + args.push(JSON.parse(value.value)); } } console.log(args); diff --git a/doric-js/index.debug.ts b/doric-js/index.debug.ts index 5583b296..261e48a9 100644 --- a/doric-js/index.debug.ts +++ b/doric-js/index.debug.ts @@ -91,20 +91,20 @@ debugServer.on('connection', function connection(ws) { console.log(messageObject.functionName) let args = [] - for (let i = 0; i < messageObject.javaValues.length; i++) { - let javaValue = messageObject.javaValues[i] - if (javaValue.type === 0) { + for (let i = 0; i < messageObject.values.length; i++) { + let value = messageObject.values[i] + if (value.type === 0) { args.push(null) - } else if (javaValue.type === 1) { - args.push(parseFloat(javaValue.value)) - } else if (javaValue.type === 2) { - args.push((javaValue.value == 'true')) - } else if (javaValue.type === 3) { - args.push(javaValue.value.toString()) - } else if (javaValue.type === 4) { - args.push(JSON.parse(javaValue.value)) - } else if (javaValue.type === 5) { - args.push(JSON.parse(javaValue.value)) + } else if (value.type === 1) { + args.push(parseFloat(value.value)) + } else if (value.type === 2) { + args.push((value.value == 'true')) + } else if (value.type === 3) { + args.push(value.value.toString()) + } else if (value.type === 4) { + args.push(JSON.parse(value.value)) + } else if (value.type === 5) { + args.push(JSON.parse(value.value)) } } console.log(args) diff --git a/doric-js/lib/index.debug.js b/doric-js/lib/index.debug.js index 877cf512..567f0700 100644 --- a/doric-js/lib/index.debug.js +++ b/doric-js/lib/index.debug.js @@ -89,25 +89,25 @@ debugServer.on('connection', function connection(ws) { console.log(messageObject.objectName); console.log(messageObject.functionName); let args = []; - for (let i = 0; i < messageObject.javaValues.length; i++) { - let javaValue = messageObject.javaValues[i]; - if (javaValue.type === 0) { + for (let i = 0; i < messageObject.values.length; i++) { + let value = messageObject.values[i]; + if (value.type === 0) { args.push(null); } - else if (javaValue.type === 1) { - args.push(parseFloat(javaValue.value)); + else if (value.type === 1) { + args.push(parseFloat(value.value)); } - else if (javaValue.type === 2) { - args.push((javaValue.value == 'true')); + else if (value.type === 2) { + args.push((value.value == 'true')); } - else if (javaValue.type === 3) { - args.push(javaValue.value.toString()); + else if (value.type === 3) { + args.push(value.value.toString()); } - else if (javaValue.type === 4) { - args.push(JSON.parse(javaValue.value)); + else if (value.type === 4) { + args.push(JSON.parse(value.value)); } - else if (javaValue.type === 5) { - args.push(JSON.parse(javaValue.value)); + else if (value.type === 5) { + args.push(JSON.parse(value.value)); } } console.log(args);