From 90c5dd28b4d289f80c9f327317199faa066f36f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Thu, 31 Oct 2019 19:10:07 +0800
Subject: [PATCH 1/2] return corresponding js decoder on sync

---
 .../src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android/doric/src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java b/Android/doric/src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java
index 9917c60d..b8ff35f0 100644
--- a/Android/doric/src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java
+++ b/Android/doric/src/main/java/pub/doric/engine/remote/RemoteJSExecutor.java
@@ -166,7 +166,7 @@ public class RemoteJSExecutor {
         webSocket.send(gson.toJson(jo));
 
         LockSupport.park(Thread.currentThread());
-        return null;
+        return temp;
     }
 
     public void destroy() {

From ff457ca7c742f8c7c211b657296d677d98a5a3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Thu, 31 Oct 2019 20:22:00 +0800
Subject: [PATCH 2/2] add debug bottom sheet

---
 .../java/pub/doric/demo/MainActivity.java     | 20 ++++++++---
 .../app/src/main/res/layout/activity_main.xml |  2 +-
 Android/doric/build.gradle                    |  4 ++-
 .../src/main/java/pub/doric/DevPanel.java     | 28 +++++++++++++++
 .../java/pub/doric/engine/DoricJSEngine.java  |  4 +--
 .../doric/src/main/res/layout/layout_dev.xml  | 34 +++++++++++++++++++
 6 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 Android/doric/src/main/java/pub/doric/DevPanel.java
 create mode 100644 Android/doric/src/main/res/layout/layout_dev.xml

diff --git a/Android/app/src/main/java/pub/doric/demo/MainActivity.java b/Android/app/src/main/java/pub/doric/demo/MainActivity.java
index 9a9a6b8a..5be44d29 100644
--- a/Android/app/src/main/java/pub/doric/demo/MainActivity.java
+++ b/Android/app/src/main/java/pub/doric/demo/MainActivity.java
@@ -15,22 +15,26 @@
  */
 package pub.doric.demo;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.io.IOException;
+
+import pub.doric.DevPanel;
 import pub.doric.Doric;
 import pub.doric.DoricContext;
 import pub.doric.dev.LocalServer;
 import pub.doric.utils.DoricUtils;
 
-import java.io.IOException;
-
 
 public class MainActivity extends AppCompatActivity {
 
+    private DevPanel mDevPanel = new DevPanel();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -47,4 +51,12 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (KeyEvent.KEYCODE_MENU == event.getKeyCode()) {
+            mDevPanel.show(getSupportFragmentManager(), "DevPanel");
+        }
+        return super.onKeyDown(keyCode, event);
+    }
 }
diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
index 1b859062..8e62fba9 100644
--- a/Android/app/src/main/res/layout/activity_main.xml
+++ b/Android/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.github.penfeizhou.doricdemo.pub.doric.demo.MainActivity">
+    tools:context=".MainActivity">
 
     <FrameLayout
         android:id="@+id/root"
diff --git a/Android/doric/build.gradle b/Android/doric/build.gradle
index 43aa1284..48396872 100644
--- a/Android/doric/build.gradle
+++ b/Android/doric/build.gradle
@@ -49,9 +49,11 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     api 'com.github.pengfeizhou:jsc4a:0.1.0'
     implementation 'com.squareup.okhttp3:okhttp:4.2.1'
-    implementation 'com.github.penfeizhou.android.animation:glide-plugin:1.0.1'
+    implementation 'com.github.penfeizhou.android.animation:glide-plugin:1.1.0'
     api 'org.nanohttpd:nanohttpd:2.3.1'
     implementation 'com.google.code.gson:gson:2.8.6'
+    api "com.google.android.material:material:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/Android/doric/src/main/java/pub/doric/DevPanel.java b/Android/doric/src/main/java/pub/doric/DevPanel.java
new file mode 100644
index 00000000..fdba6eb1
--- /dev/null
+++ b/Android/doric/src/main/java/pub/doric/DevPanel.java
@@ -0,0 +1,28 @@
+package pub.doric;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+public class DevPanel extends BottomSheetDialogFragment {
+
+    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);
+    }
+}
diff --git a/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java b/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
index 20acbb84..c7cc65e0 100644
--- a/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
+++ b/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
@@ -67,8 +67,8 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
 
 
     private void initJSExecutor() {
-//        mDoricJSE = new DoricNativeJSExecutor();
-        mDoricJSE = new DoricRemoteJSExecutor();
+        mDoricJSE = new DoricNativeJSExecutor();
+//        mDoricJSE = new DoricRemoteJSExecutor();
         mDoricJSE.injectGlobalJSFunction(DoricConstant.INJECT_LOG, new JavaFunction() {
             @Override
             public JavaValue exec(JSDecoder[] args) {
diff --git a/Android/doric/src/main/res/layout/layout_dev.xml b/Android/doric/src/main/res/layout/layout_dev.xml
new file mode 100644
index 00000000..73192065
--- /dev/null
+++ b/Android/doric/src/main/res/layout/layout_dev.xml
@@ -0,0 +1,34 @@
+<?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"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/menu1_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center"
+        android:text="Debug via Visual Studio Code"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#cccccc" />
+
+    <TextView
+        android:id="@+id/menu2_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center"
+        android:text="Enable Hot Reload"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/menu1_text_view" />
+</LinearLayout>
\ No newline at end of file