Merge branch 'master' of origin

Android/doric/src/main/java/pub/doric/DoricPanel.java

@@ -2,9 +2,9 @@ package pub.doric;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 

Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java

@@ -51,7 +51,7 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
 
 
     private void initJSExecutor() {
-        mDoricJSE = new DoricJSExecutor();
+        mDoricJSE = new DoricNativeJSExecutor();
         mDoricJSE.injectGlobalJSFunction(DoricConstant.INJECT_LOG, new JavaFunction() {
             @Override
             public JavaValue exec(JSDecoder[] args) {

Android/doric/src/main/java/pub/doric/engine/DoricNativeJSExecutor.java

@@ -11,11 +11,11 @@ import com.github.pengfeizhou.jscore.JavaValue;
  * @Author: pengfei.zhou
  * @CreateDate: 2019-07-18
  */
-public class DoricJSExecutor implements IDoricJSE {
+public class DoricNativeJSExecutor implements IDoricJSE {
 
     private final JSExecutor mJSExecutor;
 
-    public DoricJSExecutor() {
+    public DoricNativeJSExecutor() {
         this.mJSExecutor = JSExecutor.create();
     }
 

Android/doric/src/main/java/pub/doric/engine/DoricRemoteJSExecutor.java

@@ -0,0 +1,39 @@
+package pub.doric.engine;
+
+import com.github.pengfeizhou.jscore.JSDecoder;
+import com.github.pengfeizhou.jscore.JSRuntimeException;
+import com.github.pengfeizhou.jscore.JavaFunction;
+import com.github.pengfeizhou.jscore.JavaValue;
+
+public class DoricRemoteJSExecutor implements IDoricJSE {
+
+    @Override
+    public String loadJS(String script, String source) throws JSRuntimeException {
+        return null;
+    }
+
+    @Override
+    public JSDecoder evaluateJS(String script, String source, boolean hashKey) throws JSRuntimeException {
+        return null;
+    }
+
+    @Override
+    public void injectGlobalJSFunction(String name, JavaFunction javaFunction) {
+
+    }
+
+    @Override
+    public void injectGlobalJSObject(String name, JavaValue javaValue) {
+
+    }
+
+    @Override
+    public JSDecoder invokeMethod(String objectName, String functionName, JavaValue[] javaValues, boolean hashKey) throws JSRuntimeException {
+        return null;
+    }
+
+    @Override
+    public void teardown() {
+
+    }
+}

Android/doric/src/main/java/pub/doric/shader/DoricLayer.java

@@ -7,9 +7,9 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

Android/doric/src/main/java/pub/doric/shader/ImageNode.java

@@ -1,7 +1,7 @@
 package pub.doric.shader;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 

Android/doric/src/main/java/pub/doric/utils/DoricUtils.java

@@ -2,7 +2,7 @@ package pub.doric.utils;
 
 import android.content.Context;
 import android.content.res.AssetManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.WindowManager;