From a72bd3df370e7da0a874649ad4518ec3364683cb Mon Sep 17 00:00:00 2001 From: "pengfei.zhou" Date: Mon, 21 Oct 2019 09:13:52 +0800 Subject: [PATCH] change domain name to doric.pub --- Android/app/src/main/AndroidManifest.xml | 11 ++++---- .../doric/demo}/DemoLibrary.java | 9 ++++--- .../doric/demo}/DemoPlugin.java | 14 +++++----- .../doric/demo}/MainActivity.java | 10 +++---- .../doric/demo}/MyApplication.java | 6 ++--- .../doric/demo}/MyGlideModule.java | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../doric/test/ExampleInstrumentedTest.java | 26 ------------------- Android/doric/src/main/AndroidManifest.xml | 2 +- .../penfeizhou => pub}/doric/Doric.java | 2 +- .../doric/DoricComponent.java | 2 +- .../doric/DoricContext.java | 13 +++++----- .../doric/DoricContextManager.java | 4 +-- .../penfeizhou => pub}/doric/DoricDriver.java | 16 ++++++------ .../doric/DoricLibrary.java | 2 +- .../penfeizhou => pub}/doric/DoricPanel.java | 2 +- .../doric/DoricRegistry.java | 24 ++++++++--------- .../doric/IDoricDriver.java | 6 ++--- .../doric/async/AsyncCall.java | 2 +- .../doric/async/AsyncResult.java | 2 +- .../doric/async/SettableFuture.java | 2 +- .../doric/dev/LocalServer.java | 8 +++--- .../doric/dev/WSClient.java | 8 +++--- .../doric/engine/DoricJSEngine.java | 14 +++++----- .../doric/engine/DoricJSExecutor.java | 2 +- .../doric/engine/IDoricJSE.java | 2 +- .../bridge/DoricBridgeExtension.java | 18 ++++++------- .../doric/extension/bridge/DoricMethod.java | 4 +-- .../doric/extension/bridge/DoricPlugin.java | 2 +- .../doric/extension/bridge/DoricPromise.java | 6 ++--- .../extension/timer/DoricTimerExtension.java | 2 +- .../doric/plugin/DoricJavaPlugin.java | 6 ++--- .../doric/plugin/ModalPlugin.java | 12 ++++----- .../doric/plugin/ShaderPlugin.java | 14 +++++----- .../doric/shader/DoricLayer.java | 3 +-- .../doric/shader/GroupNode.java | 6 ++--- .../doric/shader/HLayoutNode.java | 6 ++--- .../doric/shader/ImageNode.java | 6 ++--- .../doric/shader/LinearNode.java | 6 ++--- .../doric/shader/RootNode.java | 6 ++--- .../doric/shader/StackNode.java | 6 ++--- .../doric/shader/TextNode.java | 6 ++--- .../doric/shader/VLayoutNode.java | 6 ++--- .../doric/shader/ViewNode.java | 14 +++++----- .../doric/utils/DoricConstant.java | 2 +- .../doric/utils/DoricContextHolder.java | 4 +-- .../doric/utils/DoricLog.java | 4 +-- .../doric/utils/DoricMetaInfo.java | 8 +++--- .../doric/utils/DoricUtils.java | 4 +-- .../doric/utils/ThreadMode.java | 2 +- .../doric/test/ExampleUnitTest.java | 17 ------------ 51 files changed, 159 insertions(+), 204 deletions(-) rename Android/app/src/main/java/{com/github/penfeizhou/doricdemo => pub/doric/demo}/DemoLibrary.java (61%) rename Android/app/src/main/java/{com/github/penfeizhou/doricdemo => pub/doric/demo}/DemoPlugin.java (69%) rename Android/app/src/main/java/{com/github/penfeizhou/doricdemo => pub/doric/demo}/MainActivity.java (80%) rename Android/app/src/main/java/{com/github/penfeizhou/doricdemo => pub/doric/demo}/MyApplication.java (70%) rename Android/app/src/main/java/{com/github/penfeizhou/doricdemo => pub/doric/demo}/MyGlideModule.java (87%) delete mode 100644 Android/doric/src/androidTest/java/com/github/penfeizhou/doric/test/ExampleInstrumentedTest.java rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/Doric.java (94%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricComponent.java (92%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricContext.java (90%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricContextManager.java (96%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricDriver.java (90%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricLibrary.java (84%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricPanel.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/DoricRegistry.java (79%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/IDoricDriver.java (84%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/async/AsyncCall.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/async/AsyncResult.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/async/SettableFuture.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/dev/LocalServer.java (96%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/dev/WSClient.java (90%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/engine/DoricJSEngine.java (94%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/engine/DoricJSExecutor.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/engine/IDoricJSE.java (98%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/extension/bridge/DoricBridgeExtension.java (85%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/extension/bridge/DoricMethod.java (81%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/extension/bridge/DoricPlugin.java (88%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/extension/bridge/DoricPromise.java (88%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/extension/timer/DoricTimerExtension.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/plugin/DoricJavaPlugin.java (61%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/plugin/ModalPlugin.java (67%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/plugin/ShaderPlugin.java (74%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/DoricLayer.java (98%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/GroupNode.java (97%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/HLayoutNode.java (78%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/ImageNode.java (92%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/LinearNode.java (94%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/RootNode.java (83%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/StackNode.java (90%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/TextNode.java (89%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/VLayoutNode.java (78%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/shader/ViewNode.java (95%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/DoricConstant.java (98%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/DoricContextHolder.java (80%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/DoricLog.java (93%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/DoricMetaInfo.java (89%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/DoricUtils.java (98%) rename Android/doric/src/main/java/{com/github/penfeizhou => pub}/doric/utils/ThreadMode.java (80%) delete mode 100644 Android/doric/src/test/java/com/github/penfeizhou/doric/test/ExampleUnitTest.java diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 0f292422..7e021b75 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -1,17 +1,18 @@ - + package="pub.doric.demo"> + + - + diff --git a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoLibrary.java b/Android/app/src/main/java/pub/doric/demo/DemoLibrary.java similarity index 61% rename from Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoLibrary.java rename to Android/app/src/main/java/pub/doric/demo/DemoLibrary.java index 1f441125..91cd479b 100644 --- a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoLibrary.java +++ b/Android/app/src/main/java/pub/doric/demo/DemoLibrary.java @@ -1,8 +1,9 @@ -package com.github.penfeizhou.doricdemo; -import com.github.penfeizhou.doric.DoricComponent; -import com.github.penfeizhou.doric.DoricLibrary; -import com.github.penfeizhou.doric.DoricRegistry; +package pub.doric.demo; + +import pub.doric.DoricComponent; +import pub.doric.DoricLibrary; +import pub.doric.DoricRegistry; /** * @Description: com.github.penfeizhou.doricdemo diff --git a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoPlugin.java b/Android/app/src/main/java/pub/doric/demo/DemoPlugin.java similarity index 69% rename from Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoPlugin.java rename to Android/app/src/main/java/pub/doric/demo/DemoPlugin.java index 96bb527c..9cbeae15 100644 --- a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/DemoPlugin.java +++ b/Android/app/src/main/java/pub/doric/demo/DemoPlugin.java @@ -1,13 +1,13 @@ -package com.github.penfeizhou.doricdemo; +package pub.doric.demo; import android.widget.Toast; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricMethod; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; -import com.github.penfeizhou.doric.extension.bridge.DoricPromise; -import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; -import com.github.penfeizhou.doric.utils.ThreadMode; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricMethod; +import pub.doric.extension.bridge.DoricPlugin; +import pub.doric.extension.bridge.DoricPromise; +import pub.doric.plugin.DoricJavaPlugin; +import pub.doric.utils.ThreadMode; import com.github.pengfeizhou.jscore.JavaValue; /** diff --git a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MainActivity.java b/Android/app/src/main/java/pub/doric/demo/MainActivity.java similarity index 80% rename from Android/app/src/main/java/com/github/penfeizhou/doricdemo/MainActivity.java rename to Android/app/src/main/java/pub/doric/demo/MainActivity.java index d95c6481..58f5a4a1 100644 --- a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MainActivity.java +++ b/Android/app/src/main/java/pub/doric/demo/MainActivity.java @@ -1,14 +1,14 @@ -package com.github.penfeizhou.doricdemo; +package pub.doric.demo; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.github.penfeizhou.doric.Doric; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.dev.LocalServer; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.Doric; +import pub.doric.DoricContext; +import pub.doric.dev.LocalServer; +import pub.doric.utils.DoricUtils; import java.io.IOException; diff --git a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyApplication.java b/Android/app/src/main/java/pub/doric/demo/MyApplication.java similarity index 70% rename from Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyApplication.java rename to Android/app/src/main/java/pub/doric/demo/MyApplication.java index 4aaff9dc..a53f687c 100644 --- a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyApplication.java +++ b/Android/app/src/main/java/pub/doric/demo/MyApplication.java @@ -1,9 +1,9 @@ -package com.github.penfeizhou.doricdemo; +package pub.doric.demo; import android.app.Application; -import com.github.penfeizhou.doric.Doric; -import com.github.penfeizhou.doric.DoricRegistry; +import pub.doric.Doric; +import pub.doric.DoricRegistry; /** * @Description: Doric diff --git a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyGlideModule.java b/Android/app/src/main/java/pub/doric/demo/MyGlideModule.java similarity index 87% rename from Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyGlideModule.java rename to Android/app/src/main/java/pub/doric/demo/MyGlideModule.java index 5f92e222..ab5ef818 100644 --- a/Android/app/src/main/java/com/github/penfeizhou/doricdemo/MyGlideModule.java +++ b/Android/app/src/main/java/pub/doric/demo/MyGlideModule.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doricdemo; +package pub.doric.demo; import com.bumptech.glide.annotation.GlideModule; import com.bumptech.glide.module.AppGlideModule; diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml index 8cef2709..a1963976 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.MainActivity"> + tools:context="com.github.penfeizhou.doricdemo.pub.doric.demo.MainActivity"> Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.github.penfeizhou.doric.test", appContext.getPackageName()); - } -} diff --git a/Android/doric/src/main/AndroidManifest.xml b/Android/doric/src/main/AndroidManifest.xml index 4e3d43ff..c334325c 100644 --- a/Android/doric/src/main/AndroidManifest.xml +++ b/Android/doric/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="pub.doric" /> diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/Doric.java b/Android/doric/src/main/java/pub/doric/Doric.java similarity index 94% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/Doric.java rename to Android/doric/src/main/java/pub/doric/Doric.java index 23fe117e..ed8c972f 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/Doric.java +++ b/Android/doric/src/main/java/pub/doric/Doric.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.app.Application; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricComponent.java b/Android/doric/src/main/java/pub/doric/DoricComponent.java similarity index 92% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricComponent.java rename to Android/doric/src/main/java/pub/doric/DoricComponent.java index c0adf11b..091bdc9b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricComponent.java +++ b/Android/doric/src/main/java/pub/doric/DoricComponent.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric; +package pub.doric; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java b/Android/doric/src/main/java/pub/doric/DoricContext.java similarity index 90% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java rename to Android/doric/src/main/java/pub/doric/DoricContext.java index 9c35c25d..00d0d70b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java +++ b/Android/doric/src/main/java/pub/doric/DoricContext.java @@ -1,13 +1,12 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.content.Context; -import android.view.ViewGroup; -import com.github.penfeizhou.doric.async.AsyncResult; -import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; -import com.github.penfeizhou.doric.utils.DoricConstant; -import com.github.penfeizhou.doric.utils.DoricMetaInfo; -import com.github.penfeizhou.doric.shader.RootNode; +import pub.doric.async.AsyncResult; +import pub.doric.plugin.DoricJavaPlugin; +import pub.doric.utils.DoricConstant; +import pub.doric.utils.DoricMetaInfo; +import pub.doric.shader.RootNode; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSONBuilder; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContextManager.java b/Android/doric/src/main/java/pub/doric/DoricContextManager.java similarity index 96% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContextManager.java rename to Android/doric/src/main/java/pub/doric/DoricContextManager.java index 9f44a8c9..d120ff72 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContextManager.java +++ b/Android/doric/src/main/java/pub/doric/DoricContextManager.java @@ -1,8 +1,8 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.content.Context; -import com.github.penfeizhou.doric.async.AsyncResult; +import pub.doric.async.AsyncResult; import java.util.Collection; import java.util.Map; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricDriver.java b/Android/doric/src/main/java/pub/doric/DoricDriver.java similarity index 90% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricDriver.java rename to Android/doric/src/main/java/pub/doric/DoricDriver.java index 66c05119..1e659a66 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricDriver.java +++ b/Android/doric/src/main/java/pub/doric/DoricDriver.java @@ -1,15 +1,15 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.os.Handler; import android.os.Looper; -import com.github.penfeizhou.doric.async.AsyncCall; -import com.github.penfeizhou.doric.async.AsyncResult; -import com.github.penfeizhou.doric.dev.WSClient; -import com.github.penfeizhou.doric.engine.DoricJSEngine; -import com.github.penfeizhou.doric.utils.DoricConstant; -import com.github.penfeizhou.doric.utils.DoricLog; -import com.github.penfeizhou.doric.utils.ThreadMode; +import pub.doric.async.AsyncCall; +import pub.doric.async.AsyncResult; +import pub.doric.dev.WSClient; +import pub.doric.engine.DoricJSEngine; +import pub.doric.utils.DoricConstant; +import pub.doric.utils.DoricLog; +import pub.doric.utils.ThreadMode; import com.github.pengfeizhou.jscore.JSDecoder; import java.util.concurrent.Callable; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricLibrary.java b/Android/doric/src/main/java/pub/doric/DoricLibrary.java similarity index 84% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricLibrary.java rename to Android/doric/src/main/java/pub/doric/DoricLibrary.java index 8ce5cb3b..a75c1dc9 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricLibrary.java +++ b/Android/doric/src/main/java/pub/doric/DoricLibrary.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric; +package pub.doric; /** * @Description: com.github.penfeizhou.doric diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricPanel.java b/Android/doric/src/main/java/pub/doric/DoricPanel.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricPanel.java rename to Android/doric/src/main/java/pub/doric/DoricPanel.java index 3848d431..551db9b6 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricPanel.java +++ b/Android/doric/src/main/java/pub/doric/DoricPanel.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.content.Context; import android.os.Build; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java b/Android/doric/src/main/java/pub/doric/DoricRegistry.java similarity index 79% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java rename to Android/doric/src/main/java/pub/doric/DoricRegistry.java index 882efcab..c14af119 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java +++ b/Android/doric/src/main/java/pub/doric/DoricRegistry.java @@ -1,18 +1,18 @@ -package com.github.penfeizhou.doric; +package pub.doric; import android.text.TextUtils; -import com.github.penfeizhou.doric.plugin.ShaderPlugin; -import com.github.penfeizhou.doric.shader.HLayoutNode; -import com.github.penfeizhou.doric.shader.ImageNode; -import com.github.penfeizhou.doric.shader.RootNode; -import com.github.penfeizhou.doric.shader.StackNode; -import com.github.penfeizhou.doric.shader.TextNode; -import com.github.penfeizhou.doric.shader.VLayoutNode; -import com.github.penfeizhou.doric.shader.ViewNode; -import com.github.penfeizhou.doric.utils.DoricMetaInfo; -import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; -import com.github.penfeizhou.doric.plugin.ModalPlugin; +import pub.doric.plugin.ShaderPlugin; +import pub.doric.shader.HLayoutNode; +import pub.doric.shader.ImageNode; +import pub.doric.shader.RootNode; +import pub.doric.shader.StackNode; +import pub.doric.shader.TextNode; +import pub.doric.shader.VLayoutNode; +import pub.doric.shader.ViewNode; +import pub.doric.utils.DoricMetaInfo; +import pub.doric.plugin.DoricJavaPlugin; +import pub.doric.plugin.ModalPlugin; import java.util.HashMap; import java.util.HashSet; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/IDoricDriver.java b/Android/doric/src/main/java/pub/doric/IDoricDriver.java similarity index 84% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/IDoricDriver.java rename to Android/doric/src/main/java/pub/doric/IDoricDriver.java index 0e1b7cf5..3cc63803 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/IDoricDriver.java +++ b/Android/doric/src/main/java/pub/doric/IDoricDriver.java @@ -1,8 +1,8 @@ -package com.github.penfeizhou.doric; +package pub.doric; -import com.github.penfeizhou.doric.async.AsyncResult; -import com.github.penfeizhou.doric.utils.ThreadMode; +import pub.doric.async.AsyncResult; +import pub.doric.utils.ThreadMode; import com.github.pengfeizhou.jscore.JSDecoder; import java.util.concurrent.Callable; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncCall.java b/Android/doric/src/main/java/pub/doric/async/AsyncCall.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncCall.java rename to Android/doric/src/main/java/pub/doric/async/AsyncCall.java index 8b247bbf..2e5a24ad 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncCall.java +++ b/Android/doric/src/main/java/pub/doric/async/AsyncCall.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.async; +package pub.doric.async; import android.os.Handler; import android.os.Looper; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncResult.java b/Android/doric/src/main/java/pub/doric/async/AsyncResult.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncResult.java rename to Android/doric/src/main/java/pub/doric/async/AsyncResult.java index f9c1df41..5f1cf40b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/AsyncResult.java +++ b/Android/doric/src/main/java/pub/doric/async/AsyncResult.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.async; +package pub.doric.async; /** * @Description: com.github.penfeizhou.doric.async diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/SettableFuture.java b/Android/doric/src/main/java/pub/doric/async/SettableFuture.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/async/SettableFuture.java rename to Android/doric/src/main/java/pub/doric/async/SettableFuture.java index c0355a6a..93088a37 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/async/SettableFuture.java +++ b/Android/doric/src/main/java/pub/doric/async/SettableFuture.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.async; +package pub.doric.async; /** * @Description: com.github.penfeizhou.doric.async diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/dev/LocalServer.java b/Android/doric/src/main/java/pub/doric/dev/LocalServer.java similarity index 96% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/dev/LocalServer.java rename to Android/doric/src/main/java/pub/doric/dev/LocalServer.java index 2707eef7..d63766b3 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/dev/LocalServer.java +++ b/Android/doric/src/main/java/pub/doric/dev/LocalServer.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.dev; +package pub.doric.dev; import android.content.Context; import android.content.res.AssetManager; @@ -6,9 +6,9 @@ import android.net.Uri; import android.util.Log; import android.webkit.MimeTypeMap; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.DoricContextManager; -import com.github.penfeizhou.doric.DoricDriver; +import pub.doric.DoricContext; +import pub.doric.DoricContextManager; + import com.github.pengfeizhou.jscore.JSONBuilder; import org.json.JSONArray; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/dev/WSClient.java b/Android/doric/src/main/java/pub/doric/dev/WSClient.java similarity index 90% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/dev/WSClient.java rename to Android/doric/src/main/java/pub/doric/dev/WSClient.java index ef507245..0e16f458 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/dev/WSClient.java +++ b/Android/doric/src/main/java/pub/doric/dev/WSClient.java @@ -1,13 +1,11 @@ -package com.github.penfeizhou.doric.dev; +package pub.doric.dev; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.DoricContextManager; -import com.github.penfeizhou.doric.DoricDriver; +import pub.doric.DoricContext; +import pub.doric.DoricContextManager; import org.json.JSONException; import org.json.JSONObject; -import java.util.Set; import java.util.concurrent.TimeUnit; import okhttp3.OkHttpClient; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSEngine.java b/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java similarity index 94% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSEngine.java rename to Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java index c8149609..cedcf8d9 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSEngine.java +++ b/Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.engine; +package pub.doric.engine; import android.os.Handler; import android.os.HandlerThread; @@ -6,12 +6,12 @@ import android.os.Looper; import android.os.Message; import android.text.TextUtils; -import com.github.penfeizhou.doric.DoricRegistry; -import com.github.penfeizhou.doric.extension.bridge.DoricBridgeExtension; -import com.github.penfeizhou.doric.extension.timer.DoricTimerExtension; -import com.github.penfeizhou.doric.utils.DoricConstant; -import com.github.penfeizhou.doric.utils.DoricLog; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.DoricRegistry; +import pub.doric.extension.bridge.DoricBridgeExtension; +import pub.doric.extension.timer.DoricTimerExtension; +import pub.doric.utils.DoricConstant; +import pub.doric.utils.DoricLog; +import pub.doric.utils.DoricUtils; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JavaFunction; import com.github.pengfeizhou.jscore.JavaValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSExecutor.java b/Android/doric/src/main/java/pub/doric/engine/DoricJSExecutor.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSExecutor.java rename to Android/doric/src/main/java/pub/doric/engine/DoricJSExecutor.java index 10fb23a7..15a0f975 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/DoricJSExecutor.java +++ b/Android/doric/src/main/java/pub/doric/engine/DoricJSExecutor.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.engine; +package pub.doric.engine; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSExecutor; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/IDoricJSE.java b/Android/doric/src/main/java/pub/doric/engine/IDoricJSE.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/engine/IDoricJSE.java rename to Android/doric/src/main/java/pub/doric/engine/IDoricJSE.java index 8455ba88..4b679b94 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/engine/IDoricJSE.java +++ b/Android/doric/src/main/java/pub/doric/engine/IDoricJSE.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.engine; +package pub.doric.engine; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSRuntimeException; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricBridgeExtension.java b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricBridgeExtension.java similarity index 85% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricBridgeExtension.java rename to Android/doric/src/main/java/pub/doric/extension/bridge/DoricBridgeExtension.java index 3c1a90d3..b2800672 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricBridgeExtension.java +++ b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricBridgeExtension.java @@ -1,13 +1,13 @@ -package com.github.penfeizhou.doric.extension.bridge; +package pub.doric.extension.bridge; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.DoricRegistry; -import com.github.penfeizhou.doric.async.AsyncResult; -import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; -import com.github.penfeizhou.doric.DoricContextManager; -import com.github.penfeizhou.doric.utils.DoricLog; -import com.github.penfeizhou.doric.utils.DoricMetaInfo; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.DoricContext; + +import pub.doric.async.AsyncResult; +import pub.doric.plugin.DoricJavaPlugin; +import pub.doric.DoricContextManager; +import pub.doric.utils.DoricLog; +import pub.doric.utils.DoricMetaInfo; +import pub.doric.utils.DoricUtils; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JavaValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricMethod.java b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricMethod.java similarity index 81% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricMethod.java rename to Android/doric/src/main/java/pub/doric/extension/bridge/DoricMethod.java index 6f246e6d..72221fca 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricMethod.java +++ b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricMethod.java @@ -1,6 +1,6 @@ -package com.github.penfeizhou.doric.extension.bridge; +package pub.doric.extension.bridge; -import com.github.penfeizhou.doric.utils.ThreadMode; +import pub.doric.utils.ThreadMode; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPlugin.java b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricPlugin.java similarity index 88% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPlugin.java rename to Android/doric/src/main/java/pub/doric/extension/bridge/DoricPlugin.java index 93dc363b..9ab1fb61 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPlugin.java +++ b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricPlugin.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.extension.bridge; +package pub.doric.extension.bridge; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPromise.java b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricPromise.java similarity index 88% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPromise.java rename to Android/doric/src/main/java/pub/doric/extension/bridge/DoricPromise.java index a461f821..f3cfe3ec 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/bridge/DoricPromise.java +++ b/Android/doric/src/main/java/pub/doric/extension/bridge/DoricPromise.java @@ -1,7 +1,7 @@ -package com.github.penfeizhou.doric.extension.bridge; +package pub.doric.extension.bridge; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.utils.DoricConstant; +import pub.doric.DoricContext; +import pub.doric.utils.DoricConstant; import com.github.pengfeizhou.jscore.JavaValue; /** diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/timer/DoricTimerExtension.java b/Android/doric/src/main/java/pub/doric/extension/timer/DoricTimerExtension.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/extension/timer/DoricTimerExtension.java rename to Android/doric/src/main/java/pub/doric/extension/timer/DoricTimerExtension.java index e4efc15f..1354f964 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/timer/DoricTimerExtension.java +++ b/Android/doric/src/main/java/pub/doric/extension/timer/DoricTimerExtension.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.extension.timer; +package pub.doric.extension.timer; import android.os.Handler; import android.os.Looper; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/DoricJavaPlugin.java b/Android/doric/src/main/java/pub/doric/plugin/DoricJavaPlugin.java similarity index 61% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/DoricJavaPlugin.java rename to Android/doric/src/main/java/pub/doric/plugin/DoricJavaPlugin.java index 4281a2a1..3ec30205 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/DoricJavaPlugin.java +++ b/Android/doric/src/main/java/pub/doric/plugin/DoricJavaPlugin.java @@ -1,7 +1,7 @@ -package com.github.penfeizhou.doric.plugin; +package pub.doric.plugin; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.utils.DoricContextHolder; +import pub.doric.DoricContext; +import pub.doric.utils.DoricContextHolder; /** * @Description: Doric diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ModalPlugin.java b/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java similarity index 67% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ModalPlugin.java rename to Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java index 147e6547..05f88d6f 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ModalPlugin.java +++ b/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java @@ -1,12 +1,12 @@ -package com.github.penfeizhou.doric.plugin; +package pub.doric.plugin; import android.widget.Toast; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; -import com.github.penfeizhou.doric.extension.bridge.DoricMethod; -import com.github.penfeizhou.doric.extension.bridge.DoricPromise; -import com.github.penfeizhou.doric.utils.ThreadMode; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; +import pub.doric.extension.bridge.DoricMethod; +import pub.doric.extension.bridge.DoricPromise; +import pub.doric.utils.ThreadMode; import com.github.pengfeizhou.jscore.ArchiveException; import com.github.pengfeizhou.jscore.JSDecoder; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java b/Android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java similarity index 74% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java rename to Android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java index 7919aa72..2dc16245 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java +++ b/Android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java @@ -1,11 +1,11 @@ -package com.github.penfeizhou.doric.plugin; +package pub.doric.plugin; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricMethod; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; -import com.github.penfeizhou.doric.utils.DoricLog; -import com.github.penfeizhou.doric.utils.ThreadMode; -import com.github.penfeizhou.doric.shader.RootNode; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricMethod; +import pub.doric.extension.bridge.DoricPlugin; +import pub.doric.utils.DoricLog; +import pub.doric.utils.ThreadMode; +import pub.doric.shader.RootNode; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSObject; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/DoricLayer.java b/Android/doric/src/main/java/pub/doric/shader/DoricLayer.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/DoricLayer.java rename to Android/doric/src/main/java/pub/doric/shader/DoricLayer.java index 41ac734b..9bc18566 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/DoricLayer.java +++ b/Android/doric/src/main/java/pub/doric/shader/DoricLayer.java @@ -1,8 +1,7 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java b/Android/doric/src/main/java/pub/doric/shader/GroupNode.java similarity index 97% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java rename to Android/doric/src/main/java/pub/doric/shader/GroupNode.java index 12a5109f..29ea0ff2 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/GroupNode.java @@ -1,10 +1,10 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.util.SparseArray; import android.view.ViewGroup; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.DoricContext; +import pub.doric.utils.DoricUtils; import com.github.pengfeizhou.jscore.JSArray; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/HLayoutNode.java b/Android/doric/src/main/java/pub/doric/shader/HLayoutNode.java similarity index 78% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/HLayoutNode.java rename to Android/doric/src/main/java/pub/doric/shader/HLayoutNode.java index 0db3ff2d..9ed44d1a 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/HLayoutNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/HLayoutNode.java @@ -1,9 +1,9 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.widget.LinearLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; /** diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java b/Android/doric/src/main/java/pub/doric/shader/ImageNode.java similarity index 92% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java rename to Android/doric/src/main/java/pub/doric/shader/ImageNode.java index b165e5ca..06a3b91f 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/ImageNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.graphics.drawable.Drawable; import android.support.annotation.Nullable; @@ -10,8 +10,8 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/LinearNode.java b/Android/doric/src/main/java/pub/doric/shader/LinearNode.java similarity index 94% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/LinearNode.java rename to Android/doric/src/main/java/pub/doric/shader/LinearNode.java index e13ff0b2..6a8f1bfb 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/LinearNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/LinearNode.java @@ -1,11 +1,11 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.graphics.drawable.ShapeDrawable; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.DoricContext; +import pub.doric.utils.DoricUtils; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java b/Android/doric/src/main/java/pub/doric/shader/RootNode.java similarity index 83% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java rename to Android/doric/src/main/java/pub/doric/shader/RootNode.java index cd67271e..abecaaaa 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/RootNode.java @@ -1,11 +1,11 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; /** diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java b/Android/doric/src/main/java/pub/doric/shader/StackNode.java similarity index 90% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java rename to Android/doric/src/main/java/pub/doric/shader/StackNode.java index 7b2436de..2e2ef81a 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/StackNode.java @@ -1,10 +1,10 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java b/Android/doric/src/main/java/pub/doric/shader/TextNode.java similarity index 89% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java rename to Android/doric/src/main/java/pub/doric/shader/TextNode.java index f6c606ba..154e946d 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/TextNode.java @@ -1,11 +1,11 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.util.TypedValue; import android.view.ViewGroup; import android.widget.TextView; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/VLayoutNode.java b/Android/doric/src/main/java/pub/doric/shader/VLayoutNode.java similarity index 78% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/VLayoutNode.java rename to Android/doric/src/main/java/pub/doric/shader/VLayoutNode.java index 2b5d4939..50ed8e60 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/VLayoutNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/VLayoutNode.java @@ -1,9 +1,9 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.widget.LinearLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricPlugin; import com.github.pengfeizhou.jscore.JSObject; /** diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java b/Android/doric/src/main/java/pub/doric/shader/ViewNode.java similarity index 95% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java rename to Android/doric/src/main/java/pub/doric/shader/ViewNode.java index b9c011c1..217dbcab 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/ViewNode.java @@ -1,16 +1,16 @@ -package com.github.penfeizhou.doric.shader; +package pub.doric.shader; import android.content.Context; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.DoricRegistry; -import com.github.penfeizhou.doric.utils.DoricContextHolder; -import com.github.penfeizhou.doric.utils.DoricConstant; -import com.github.penfeizhou.doric.utils.DoricMetaInfo; -import com.github.penfeizhou.doric.utils.DoricUtils; +import pub.doric.DoricContext; +import pub.doric.DoricRegistry; +import pub.doric.utils.DoricContextHolder; +import pub.doric.utils.DoricConstant; +import pub.doric.utils.DoricMetaInfo; +import pub.doric.utils.DoricUtils; import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSValue; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricConstant.java b/Android/doric/src/main/java/pub/doric/utils/DoricConstant.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricConstant.java rename to Android/doric/src/main/java/pub/doric/utils/DoricConstant.java index 549ddac3..47b4913b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricConstant.java +++ b/Android/doric/src/main/java/pub/doric/utils/DoricConstant.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; /** * @Description: Doric diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricContextHolder.java b/Android/doric/src/main/java/pub/doric/utils/DoricContextHolder.java similarity index 80% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricContextHolder.java rename to Android/doric/src/main/java/pub/doric/utils/DoricContextHolder.java index 4d7c9350..5fb3056c 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricContextHolder.java +++ b/Android/doric/src/main/java/pub/doric/utils/DoricContextHolder.java @@ -1,6 +1,6 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; -import com.github.penfeizhou.doric.DoricContext; +import pub.doric.DoricContext; /** * @Description: com.github.penfeizhou.doric.utils diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricLog.java b/Android/doric/src/main/java/pub/doric/utils/DoricLog.java similarity index 93% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricLog.java rename to Android/doric/src/main/java/pub/doric/utils/DoricLog.java index 862bf521..503b87ad 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricLog.java +++ b/Android/doric/src/main/java/pub/doric/utils/DoricLog.java @@ -1,9 +1,9 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; import android.text.TextUtils; import android.util.Log; -import com.github.penfeizhou.doric.Doric; +import pub.doric.Doric; /** * @Description: Doric diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricMetaInfo.java b/Android/doric/src/main/java/pub/doric/utils/DoricMetaInfo.java similarity index 89% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricMetaInfo.java rename to Android/doric/src/main/java/pub/doric/utils/DoricMetaInfo.java index 414078fe..b372f6f7 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricMetaInfo.java +++ b/Android/doric/src/main/java/pub/doric/utils/DoricMetaInfo.java @@ -1,10 +1,10 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; import android.text.TextUtils; -import com.github.penfeizhou.doric.DoricContext; -import com.github.penfeizhou.doric.extension.bridge.DoricMethod; -import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; +import pub.doric.DoricContext; +import pub.doric.extension.bridge.DoricMethod; +import pub.doric.extension.bridge.DoricPlugin; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricUtils.java b/Android/doric/src/main/java/pub/doric/utils/DoricUtils.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricUtils.java rename to Android/doric/src/main/java/pub/doric/utils/DoricUtils.java index 2ac78b02..330ab7fc 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/DoricUtils.java +++ b/Android/doric/src/main/java/pub/doric/utils/DoricUtils.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; import android.content.Context; import android.content.res.AssetManager; @@ -7,7 +7,7 @@ import android.util.DisplayMetrics; import android.view.Display; import android.view.WindowManager; -import com.github.penfeizhou.doric.Doric; +import pub.doric.Doric; import com.github.pengfeizhou.jscore.JSArray; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSONBuilder; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/ThreadMode.java b/Android/doric/src/main/java/pub/doric/utils/ThreadMode.java similarity index 80% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/utils/ThreadMode.java rename to Android/doric/src/main/java/pub/doric/utils/ThreadMode.java index 33a26531..3342d81b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/utils/ThreadMode.java +++ b/Android/doric/src/main/java/pub/doric/utils/ThreadMode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.utils; +package pub.doric.utils; /** * @Description: com.github.penfeizhou.doric.utils diff --git a/Android/doric/src/test/java/com/github/penfeizhou/doric/test/ExampleUnitTest.java b/Android/doric/src/test/java/com/github/penfeizhou/doric/test/ExampleUnitTest.java deleted file mode 100644 index bb308716..00000000 --- a/Android/doric/src/test/java/com/github/penfeizhou/doric/test/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.penfeizhou.doric.test; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file