tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

split dev kit & doric core

Browse Source
This commit is contained in:
王劲鹏
2019-11-22 20:43:44 +08:00
parent 3784fb964b
commit b434f61742
42 changed files with 242 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Android/doric/src/main/AndroidManifest.xml
View File

@@ -1,9 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="pub.doric">
<uses-permission android:name="android.permission.CAMERA" />
<application>
<activity android:name=".dev.ScanQRCodeActivity" />
</application>
</manifest>
<manifest package="pub.doric" />

18
Android/doric/src/main/java/pub/doric/Doric.java
View File

@@ -17,11 +17,6 @@ package pub.doric;
import android.app.Application;
import com.google.gson.JsonObject;
import pub.doric.dev.DevKit;
import pub.doric.dev.IDevKit;
/**
* @Description: Doric
* @Author: pengfei.zhou
@@ -37,17 +32,4 @@ public class Doric {
public static Application application() {
return sApplication;
}
public static void connectDevKit(String url) {
DevKit.getInstance().connectDevKit(url);
}
public static void sendDevCommand(IDevKit.Command command, JsonObject jsonObject) {
DevKit.getInstance().sendDevCommand(command, jsonObject);
}
public static void disconnectDevKit() {
DevKit.getInstance().disconnectDevKit();
}
}

2
Android/doric/src/main/java/pub/doric/DoricContext.java
View File

@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
import pub.doric.async.AsyncResult;
import pub.doric.engine.IStatusCallback;
import pub.doric.devkit.IStatusCallback;
import pub.doric.plugin.DoricJavaPlugin;
import pub.doric.shader.RootNode;
import pub.doric.utils.DoricConstant;

2
Android/doric/src/main/java/pub/doric/DoricDebugDriver.java
View File

@@ -26,8 +26,8 @@ import java.util.concurrent.Executors;
import pub.doric.async.AsyncCall;
import pub.doric.async.AsyncResult;
import pub.doric.devkit.IStatusCallback;
import pub.doric.engine.DoricJSEngine;
import pub.doric.engine.IStatusCallback;
import pub.doric.utils.DoricConstant;
import pub.doric.utils.DoricLog;
import pub.doric.utils.ThreadMode;

79
Android/doric/src/main/java/pub/doric/dev/DebugContextPanel.java
View File

@@ -1,79 +0,0 @@
package pub.doric.dev;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import com.google.gson.JsonObject;
import pub.doric.BuildConfig;
import pub.doric.Doric;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.R;
public class DebugContextPanel extends DialogFragment {
@Nullable
@Override
public View onCreateView(
@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState
) {
return inflater.inflate(R.layout.layout_debug_context, container, false);
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Dialog dialog = super.onCreateDialog(savedInstanceState);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
return dialog;
}
@Override
public void onStart() {
super.onStart();
Dialog dialog = getDialog();
if (dialog != null) {
dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
}
LinearLayout container = getView().findViewById(R.id.container);
LayoutInflater inflater = LayoutInflater.from(getContext());
for (final DoricContext doricContext : DoricContextManager.aliveContexts()) {
View cell = inflater.inflate(R.layout.layout_debug_context_cell, container, false);
TextView contextIdTextView = cell.findViewById(R.id.context_id_text_view);
contextIdTextView.setText(doricContext.getContextId());
TextView sourceTextView = cell.findViewById(R.id.source_text_view);
sourceTextView.setText(doricContext.getSource());
cell.findViewById(R.id.debug_text_view).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("contextId", doricContext.getContextId());
jsonObject.addProperty("projectHome", BuildConfig.PROJECT_HOME);
jsonObject.addProperty("source", doricContext.getSource().replace(".js", ".ts"));
Doric.sendDevCommand(IDevKit.Command.DEBUG, jsonObject);
dismissAllowingStateLoss();
}
});
container.addView(cell);
}
}
}

44
Android/doric/src/main/java/pub/doric/dev/DevKit.java
View File

@@ -1,44 +0,0 @@
package pub.doric.dev;
import com.google.gson.JsonObject;
import pub.doric.utils.DoricUtils;
public class DevKit implements IDevKit {
static boolean isRunningInEmulator = false;
public static String ip = "";
private static class Inner {
private static final DevKit sInstance = new DevKit();
}
private DevKit() {
}
public static DevKit getInstance() {
return Inner.sInstance;
}
private WSClient wsClient;
@Override
public void connectDevKit(String url) {
wsClient = new WSClient(url);
}
@Override
public void sendDevCommand(IDevKit.Command command, JsonObject jsonObject) {
JsonObject result = new JsonObject();
result.addProperty("cmd", command.toString());
result.add("data", jsonObject);
wsClient.send(DoricUtils.gson.toJson(result));
}
@Override
public void disconnectDevKit() {
wsClient.close();
wsClient = null;
}
}

136
Android/doric/src/main/java/pub/doric/dev/DevPanel.java
View File

@@ -1,136 +0,0 @@
package pub.doric.dev;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.lahm.library.EasyProtectorLib;
import com.lahm.library.EmulatorCheckCallback;
import com.tbruyelle.rxpermissions2.RxPermissions;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import pub.doric.Doric;
import pub.doric.R;
import pub.doric.dev.event.ConnectExceptionEvent;
import pub.doric.dev.event.EOFExceptionEvent;
import pub.doric.dev.event.OpenEvent;
public class DevPanel extends BottomSheetDialogFragment {
static boolean isDevConnected = false;
public DevPanel() {
}
@Nullable
@Override
public View onCreateView(
@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState
) {
return inflater.inflate(R.layout.layout_dev, container, false);
}
@Override
public void onStart() {
super.onStart();
updateUI();
getView().findViewById(R.id.connect_dev_kit_text_view).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (DevKit.isRunningInEmulator) {
DevKit.ip = "10.0.2.2";
Doric.connectDevKit("ws://" + DevKit.ip + ":7777");
} else {
final RxPermissions rxPermissions = new RxPermissions(DevPanel.this);
Disposable disposable = rxPermissions
.request(Manifest.permission.CAMERA)
.subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean grant) throws Exception {
if (grant) {
Intent intent = new Intent(getContext(), ScanQRCodeActivity.class);
getContext().startActivity(intent);
}
}
});
}
}
});
getView().findViewById(R.id.debug_text_view).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
DebugContextPanel debugContextPanel = new DebugContextPanel();
debugContextPanel.show(getActivity().getSupportFragmentManager(), "DebugContextPanel");
dismissAllowingStateLoss();
}
});
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
EventBus.getDefault().register(this);
DevKit.isRunningInEmulator = EasyProtectorLib.checkIsRunningInEmulator(context, new EmulatorCheckCallback() {
@Override
public void findEmulator(String emulatorInfo) {
System.out.println(emulatorInfo);
}
});
}
@Override
public void onDetach() {
super.onDetach();
EventBus.getDefault().unregister(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onOpenEvent(OpenEvent openEvent) {
updateUI();
Toast.makeText(getContext(), "dev kit connected", Toast.LENGTH_LONG).show();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEOFEvent(EOFExceptionEvent eofExceptionEvent) {
updateUI();
Toast.makeText(getContext(), "dev kit eof exception", Toast.LENGTH_LONG).show();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onConnectExceptionEvent(ConnectExceptionEvent connectExceptionEvent) {
updateUI();
Toast.makeText(getContext(), "dev kit connection exception", Toast.LENGTH_LONG).show();
}
private void updateUI() {
if (isDevConnected) {
getView().findViewById(R.id.connect_dev_kit_text_view).setVisibility(View.GONE);
getView().findViewById(R.id.debug_text_view).setVisibility(View.VISIBLE);
getView().findViewById(R.id.hot_reload_text_view).setVisibility(View.VISIBLE);
} else {
getView().findViewById(R.id.connect_dev_kit_text_view).setVisibility(View.VISIBLE);
getView().findViewById(R.id.debug_text_view).setVisibility(View.GONE);
getView().findViewById(R.id.hot_reload_text_view).setVisibility(View.GONE);
}
}
}

18
Android/doric/src/main/java/pub/doric/dev/IDevKit.java
View File

@@ -1,18 +0,0 @@
package pub.doric.dev;
import com.google.gson.JsonObject;
import pub.doric.IDoricDriver;
public interface IDevKit {
enum Command {
DEBUG, HOT_RELOAD
}
void connectDevKit(String url);
void sendDevCommand(IDevKit.Command command, JsonObject jsonObject);
void disconnectDevKit();
}

78
Android/doric/src/main/java/pub/doric/dev/ScanQRCodeActivity.java
View File

@@ -1,78 +0,0 @@
package pub.doric.dev;
import android.os.Bundle;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import cn.bingoogolapple.qrcode.core.QRCodeView;
import cn.bingoogolapple.qrcode.zxing.ZXingView;
import pub.doric.Doric;
import pub.doric.R;
public class ScanQRCodeActivity extends AppCompatActivity implements QRCodeView.Delegate {
private ZXingView mZXingView;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.layout_scan_qrcode);
mZXingView = findViewById(R.id.zxingview);
mZXingView.setDelegate(this);
}
@Override
protected void onStart() {
super.onStart();
mZXingView.startCamera();
mZXingView.startSpotAndShowRect();
}
@Override
protected void onStop() {
super.onStop();
mZXingView.stopCamera();
super.onStop();
}
@Override
protected void onDestroy() {
mZXingView.onDestroy();
super.onDestroy();
}
@Override
public void onScanQRCodeSuccess(String result) {
setTitle("扫描结果为：" + result);
DevKit.ip = result;
Toast.makeText(this, "dev kit connecting to " + result, Toast.LENGTH_LONG).show();
Doric.connectDevKit("ws://" + result + ":7777");
finish();
}
@Override
public void onCameraAmbientBrightnessChanged(boolean isDark) {
String tipText = mZXingView.getScanBoxView().getTipText();
String ambientBrightnessTip = "\n环境过暗，请打开闪光灯";
if (isDark) {
if (!tipText.contains(ambientBrightnessTip)) {
mZXingView.getScanBoxView().setTipText(tipText + ambientBrightnessTip);
}
} else {
if (tipText.contains(ambientBrightnessTip)) {
tipText = tipText.substring(0, tipText.indexOf(ambientBrightnessTip));
mZXingView.getScanBoxView().setTipText(tipText);
}
}
}
@Override
public void onScanQRCodeOpenCameraError() {
System.out.println();
}
}

113
Android/doric/src/main/java/pub/doric/dev/SensorManagerHelper.java
View File

@@ -1,113 +0,0 @@
package pub.doric.dev;
import android.content.Context;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
public class SensorManagerHelper implements SensorEventListener {
// 速度阈值，当摇晃速度达到这值后产生作用
private final int SPEED_SHRESHOLD = 5000;
// 两次检测的时间间隔
private final int UPTATE_INTERVAL_TIME = 50;
// 传感器管理器
private SensorManager sensorManager;
// 传感器
private Sensor sensor;
// 重力感应监听器
private OnShakeListener onShakeListener;
// 上下文对象context
private Context context;
// 手机上一个位置时重力感应坐标
private float lastX;
private float lastY;
private float lastZ;
// 上次检测时间
private long lastUpdateTime;
public SensorManagerHelper(Context context) {
this.context = context;
start();
}
/**
* 开始检测
*/
public void start() {
// 获得传感器管理器
sensorManager = (SensorManager) context
.getSystemService(Context.SENSOR_SERVICE);
if (sensorManager != null) {
// 获得重力传感器
sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
}
// 注册
if (sensor != null) {
sensorManager.registerListener(this, sensor,
SensorManager.SENSOR_DELAY_GAME);
}
}
/**
* 停止检测
*/
public void stop() {
sensorManager.unregisterListener(this);
}
/**
* 摇晃监听接口
*/
public interface OnShakeListener {
void onShake();
}
/**
* 设置重力感应监听器
*/
public void setOnShakeListener(OnShakeListener listener) {
onShakeListener = listener;
}
@Override
public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
/**
* 重力感应器感应获得变化数据
* android.hardware.SensorEventListener#onSensorChanged(android.hardware
* .SensorEvent)
*/
@Override
public void onSensorChanged(SensorEvent event) {
// 现在检测时间
long currentUpdateTime = System.currentTimeMillis();
// 两次检测的时间间隔
long timeInterval = currentUpdateTime - lastUpdateTime;
// 判断是否达到了检测时间间隔
if (timeInterval < UPTATE_INTERVAL_TIME) return;
// 现在的时间变成last时间
lastUpdateTime = currentUpdateTime;
// 获得x,y,z坐标
float x = event.values[0];
float y = event.values[1];
float z = event.values[2];
// 获得x,y,z的变化值
float deltaX = x - lastX;
float deltaY = y - lastY;
float deltaZ = z - lastZ;
// 将现在的坐标变成last坐标
lastX = x;
lastY = y;
lastZ = z;
double speed = Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ
* deltaZ)
/ timeInterval * 10000;
// 达到速度阀值，发出提示
if (speed >= SPEED_SHRESHOLD) {
onShakeListener.onShake();
}
}
}

123
Android/doric/src/main/java/pub/doric/dev/WSClient.java
View File

@@ -1,123 +0,0 @@
/*
* Copyright [2019] [Doric.Pub]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pub.doric.dev;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.EOFException;
import java.net.ConnectException;
import java.util.concurrent.TimeUnit;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.WebSocket;
import okhttp3.WebSocketListener;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.dev.event.ConnectExceptionEvent;
import pub.doric.dev.event.EOFExceptionEvent;
import pub.doric.dev.event.EnterDebugEvent;
import pub.doric.dev.event.OpenEvent;
/**
* @Description: com.github.penfeizhou.doric.dev
* @Author: pengfei.zhou
* @CreateDate: 2019-08-03
*/
public class WSClient extends WebSocketListener {
private final WebSocket webSocket;
public WSClient(String url) {
OkHttpClient okHttpClient = new OkHttpClient
.Builder()
.readTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.build();
Request request = new Request.Builder().url(url).build();
webSocket = okHttpClient.newWebSocket(request, this);
}
public void close() {
webSocket.close(-1, "Close");
}
@Override
public void onOpen(WebSocket webSocket, Response response) {
super.onOpen(webSocket, response);
DevPanel.isDevConnected = true;
EventBus.getDefault().post(new OpenEvent());
}
@Override
public void onMessage(WebSocket webSocket, String text) {
super.onMessage(webSocket, text);
try {
JSONObject jsonObject = new JSONObject(text);
String cmd = jsonObject.optString("cmd");
switch (cmd) {
case "RELOAD": {
String source = jsonObject.optString("source");
String script = jsonObject.optString("script");
for (DoricContext context : DoricContextManager.aliveContexts()) {
if (source.contains(context.getSource())) {
context.reload(script);
}
}
}
break;
case "SWITCH_TO_DEBUG": {
EventBus.getDefault().post(new EnterDebugEvent());
}
break;
}
} catch (JSONException e) {
e.printStackTrace();
}
}
@Override
public void onClosing(WebSocket webSocket, int code, String reason) {
super.onClosing(webSocket, code, reason);
}
@Override
public void onClosed(WebSocket webSocket, int code, String reason) {
super.onClosed(webSocket, code, reason);
}
@Override
public void onFailure(WebSocket webSocket, Throwable t, Response response) {
super.onFailure(webSocket, t, response);
if (t instanceof EOFException) {
DevPanel.isDevConnected = false;
EventBus.getDefault().post(new EOFExceptionEvent());
} else if (t instanceof ConnectException) {
DevPanel.isDevConnected = false;
EventBus.getDefault().post(new ConnectExceptionEvent());
}
}
public void send(String command) {
webSocket.send(command);
}
}

4
Android/doric/src/main/java/pub/doric/dev/event/ConnectExceptionEvent.java
View File

@@ -1,4 +0,0 @@
package pub.doric.dev.event;
public class ConnectExceptionEvent {
}

4
Android/doric/src/main/java/pub/doric/dev/event/EOFExceptionEvent.java
View File

@@ -1,4 +0,0 @@
package pub.doric.dev.event;
public class EOFExceptionEvent {
}

4
Android/doric/src/main/java/pub/doric/dev/event/EnterDebugEvent.java
View File

@@ -1,4 +0,0 @@
package pub.doric.dev.event;
public class EnterDebugEvent {
}

4
Android/doric/src/main/java/pub/doric/dev/event/OpenEvent.java
View File

@@ -1,4 +0,0 @@
package pub.doric.dev.event;
public class OpenEvent {
}

4
Android/doric/src/main/java/pub/doric/dev/event/QuitDebugEvent.java
View File

@@ -1,4 +0,0 @@
package pub.doric.dev.event;
public class QuitDebugEvent {
}

1
Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
View File

@@ -28,6 +28,7 @@ import com.github.pengfeizhou.jscore.JavaValue;
import java.util.ArrayList;
import pub.doric.DoricRegistry;
import pub.doric.devkit.IStatusCallback;
import pub.doric.extension.bridge.DoricBridgeExtension;
import pub.doric.extension.timer.DoricTimerExtension;
import pub.doric.utils.DoricConstant;

3
Android/doric/src/main/java/pub/doric/engine/DoricRemoteJSExecutor.java
View File

@@ -20,7 +20,8 @@ import com.github.pengfeizhou.jscore.JSRuntimeException;
import com.github.pengfeizhou.jscore.JavaFunction;
import com.github.pengfeizhou.jscore.JavaValue;
import pub.doric.engine.remote.RemoteJSExecutor;
import pub.doric.devkit.IStatusCallback;
import pub.doric.devkit.remote.RemoteJSExecutor;
public class DoricRemoteJSExecutor implements IDoricJSE {

5
Android/doric/src/main/java/pub/doric/engine/IStatusCallback.java
View File

@@ -1,5 +0,0 @@
package pub.doric.engine;
public interface IStatusCallback {
void start();
}

148
Android/doric/src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java
View File

@@ -1,148 +0,0 @@
package pub.doric.engine.remote;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSONBuilder;
import com.github.pengfeizhou.jscore.JavaFunction;
import com.github.pengfeizhou.jscore.JavaValue;
import org.greenrobot.eventbus.EventBus;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.EOFException;
import java.net.ConnectException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.WebSocket;
import okhttp3.WebSocketListener;
import pub.doric.dev.DevKit;
import pub.doric.dev.event.QuitDebugEvent;
import pub.doric.engine.IStatusCallback;
public class RemoteJSExecutor {
private final WebSocket webSocket;
private final Map<String, JavaFunction> globalFunctions = new HashMap<>();
private JSDecoder temp;
public RemoteJSExecutor(final IStatusCallback statusCallback) {
OkHttpClient okHttpClient = new OkHttpClient
.Builder()
.readTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.build();
final Request request = new Request.Builder().url("ws://" + DevKit.ip + ":2080").build();
final Thread current = Thread.currentThread();
webSocket = okHttpClient.newWebSocket(request, new WebSocketListener() {
@Override
public void onOpen(WebSocket webSocket, Response response) {
LockSupport.unpark(current);
statusCallback.start();
}
@Override
public void onFailure(WebSocket webSocket, Throwable t, Response response) {
if (t instanceof ConnectException) {
// 连接remote异常
LockSupport.unpark(current);
throw new RuntimeException("remote js executor cannot connect");
} else if (t instanceof EOFException) {
// 被远端强制断开
System.out.println("remote js executor eof");
LockSupport.unpark(current);
EventBus.getDefault().post(new QuitDebugEvent());
}
}
@Override
public void onMessage(@NotNull WebSocket webSocket, @NotNull String text) {
try {
JSONObject jsonObject = new JSONObject(text);
String cmd = jsonObject.optString("cmd");
switch (cmd) {
case "injectGlobalJSFunction": {
String name = jsonObject.optString("name");
JSONArray arguments = jsonObject.optJSONArray("arguments");
assert arguments != null;
JSDecoder[] decoders = new JSDecoder[arguments.length()];
for (int i = 0; i < arguments.length(); i++) {
Object o = arguments.get(i);
decoders[i] = new JSDecoder(new ValueBuilder(o).build());
}
globalFunctions.get(name).exec(decoders);
}
break;
case "invokeMethod": {
try {
Object result = jsonObject.opt("result");
ValueBuilder vb = new ValueBuilder(result);
temp = new JSDecoder(vb.build());
System.out.println(result);
} catch (Exception ex) {
ex.printStackTrace();
} finally {
LockSupport.unpark(current);
}
}
break;
}
} catch (JSONException e) {
e.printStackTrace();
}
}
});
LockSupport.park(current);
}
public String loadJS(String script, String source) {
return null;
}
public JSDecoder evaluateJS(String script, String source, boolean hashKey) {
return null;
}
public void injectGlobalJSFunction(String name, JavaFunction javaFunction) {
globalFunctions.put(name, javaFunction);
webSocket.send(new JSONBuilder().put("cmd", "injectGlobalJSFunction")
.put("name", name).toString()
);
}
public void injectGlobalJSObject(String name, JavaValue javaValue) {
}
public JSDecoder invokeMethod(String objectName, String functionName, JavaValue[] javaValues, boolean hashKey) {
JSONArray jsonArray = new JSONArray();
for (JavaValue javaValue : javaValues) {
jsonArray.put(new JSONBuilder()
.put("type", javaValue.getType())
.put("value", javaValue.getValue())
.toJSONObject());
}
webSocket.send(new JSONBuilder()
.put("cmd", "invokeMethod")
.put("objectName", objectName)
.put("functionName", functionName)
.put("javaValues", jsonArray)
.put("hashKey", hashKey)
.toString());
LockSupport.park(Thread.currentThread());
return temp;
}
public void destroy() {
webSocket.close(1000, "destroy");
}
}

91
Android/doric/src/main/java/pub/doric/engine/remote/ValueBuilder.java
View File

@@ -1,91 +0,0 @@
package pub.doric.engine.remote;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.ByteArrayOutputStream;
import java.util.Iterator;
/**
* Created by pengfei.zhou on 2018/4/17.
*/
public class ValueBuilder {
private final Object val;
private void writeBoolean(ByteArrayOutputStream output, boolean b) {
output.write((byte) (b ? 1 : 0));
}
private void writeInt(ByteArrayOutputStream output, int i) {
output.write((byte) (i >>> 24));
output.write((byte) (i >>> 16));
output.write((byte) (i >>> 8));
output.write((byte) i);
}
private void writeDouble(ByteArrayOutputStream output, double d) {
long l = Double.doubleToRawLongBits(d);
output.write((byte) (l >>> 56));
output.write((byte) (l >>> 48));
output.write((byte) (l >>> 40));
output.write((byte) (l >>> 32));
output.write((byte) (l >>> 24));
output.write((byte) (l >>> 16));
output.write((byte) (l >>> 8));
output.write((byte) l);
}
private void writeString(ByteArrayOutputStream output, String S) {
byte[] buf;
try {
buf = S.getBytes("UTF-8");
} catch (Exception e) {
buf = new byte[0];
}
int i = buf.length;
writeInt(output, i);
output.write(buf, 0, i);
}
private void write(ByteArrayOutputStream output, Object O) {
if (O instanceof Number) {
output.write((byte) 'D');
writeDouble(output, Double.valueOf(String.valueOf(O)));
} else if (O instanceof String) {
output.write((byte) 'S');
writeString(output, (String) O);
} else if (O instanceof Boolean) {
output.write((byte) 'B');
writeBoolean(output, (Boolean) O);
} else if (O instanceof JSONObject) {
output.write((byte) 'O');
//writeBoolean(output, (Boolean) O);
Iterator<String> iterator = ((JSONObject) O).keys();
while (iterator.hasNext()) {
String key = iterator.next();
write(output, key);
write(output, ((JSONObject) O).opt(key));
}
output.write((byte) 'N');
} else if (O instanceof JSONArray) {
output.write((byte) 'A');
writeInt(output, ((JSONArray) O).length());
for (int i = 0; i < ((JSONArray) O).length(); i++) {
write(output, ((JSONArray) O).opt(i));
}
} else {
output.write((byte) 'N');
}
}
public ValueBuilder(Object o) {
this.val = o;
}
public byte[] build() {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
write(outputStream, val);
return outputStream.toByteArray();
}
}

3
Android/doric/src/main/java/pub/doric/utils/DoricUtils.java
View File

@@ -28,7 +28,6 @@ import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSONBuilder;
import com.github.pengfeizhou.jscore.JSValue;
import com.github.pengfeizhou.jscore.JavaValue;
import com.google.gson.Gson;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -46,8 +45,6 @@ import pub.doric.Doric;
* @CreateDate: 2019-07-18
*/
public class DoricUtils {
public static Gson gson = new Gson();
public static String readAssetFile(String assetFile) {
InputStream inputStream = null;
try {

9
Android/doric/src/main/java/pub/doric/dev/LocalServer.java → Android/doric/src/main/java/pub/doric/utils/LocalServer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pub.doric.dev;
package pub.doric.utils;
import android.content.Context;
import android.content.res.AssetManager;
@@ -21,9 +21,6 @@ import android.net.Uri;
import android.util.Log;
import android.webkit.MimeTypeMap;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import com.github.pengfeizhou.jscore.JSONBuilder;
import org.json.JSONArray;
@@ -42,6 +39,8 @@ import java.util.List;
import java.util.Map;
import fi.iki.elonen.NanoHTTPD;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
/**
* @Description: com.github.penfeizhou.doricdemo
@@ -171,7 +170,7 @@ public class LocalServer extends NanoHTTPD {
} catch (IOException e) {
e.printStackTrace();
}
return NanoHTTPD.newFixedLengthResponse(NanoHTTPD.Response.Status.OK, "text/html", "HelloWorld");
return NanoHTTPD.newFixedLengthResponse(Response.Status.OK, "text/html", "HelloWorld");
}
public interface APICommand {

13
Android/doric/src/main/res/layout/layout_debug_context.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</ScrollView>

38
Android/doric/src/main/res/layout/layout_debug_context_cell.xml
View File

@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/context_id_text_view"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="1"
android:gravity="center"
android:singleLine="true"
android:text="{Context Id}"
android:textSize="20sp" />
<TextView
android:id="@+id/source_text_view"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="3"
android:gravity="center"
android:singleLine="true"
android:text="{Source}"
android:textSize="20sp" />
<TextView
android:id="@+id/debug_text_view"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="1"
android:background="#ff0000"
android:gravity="center"
android:singleLine="true"
android:text="Debug"
android:textColor="#ffffff"
android:textSize="20sp" />
</LinearLayout>

34
Android/doric/src/main/res/layout/layout_dev.xml
View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@drawable/divider"
android:orientation="vertical"
android:showDividers="middle">
<TextView
android:id="@+id/connect_dev_kit_text_view"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center"
android:text="Dev Kit"
android:textSize="20sp" />
<TextView
android:id="@+id/debug_text_view"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center"
android:text="Debug via Visual Studio Code"
android:textSize="20sp"
android:visibility="gone" />
<TextView
android:id="@+id/hot_reload_text_view"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center"
android:text="Enable Hot Reload"
android:textSize="20sp"
android:visibility="gone" />
</LinearLayout>

20
Android/doric/src/main/res/layout/layout_scan_qrcode.xml
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<cn.bingoogolapple.qrcode.zxing.ZXingView
android:id="@+id/zxingview"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:qrcv_animTime="1000"
app:qrcv_borderColor="@android:color/white"
app:qrcv_borderSize="1dp"
app:qrcv_cornerLength="20dp"
app:qrcv_cornerSize="3dp"
app:qrcv_maskColor="#33FFFFFF"
app:qrcv_rectWidth="200dp"
app:qrcv_scanLineSize="1dp"
app:qrcv_topOffset="90dp" />
</LinearLayout>