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

feat:add Popover for Android step2

Browse Source
This commit is contained in:
pengfei.zhou
2019-11-29 10:08:26 +08:00
parent 33336b0873
commit 152f136b67
5 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,9 @@ public class DoricContext {
}
public ViewNode targetViewNode(String id) {
if (id.equals(mRootNode.getId())) {
return mRootNode;
}
return mHeadNodes.get(id);
}

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

@@ -23,6 +23,7 @@ import pub.doric.loader.IDoricJSLoader;
import pub.doric.plugin.NavBarPlugin;
import pub.doric.plugin.NavigatorPlugin;
import pub.doric.plugin.NetworkPlugin;
import pub.doric.plugin.PopoverPlugin;
import pub.doric.plugin.ShaderPlugin;
import pub.doric.plugin.StoragePlugin;
import pub.doric.refresh.RefreshableNode;
@@ -87,6 +88,7 @@ public class DoricRegistry {
this.registerNativePlugin(StoragePlugin.class);
this.registerNativePlugin(NavigatorPlugin.class);
this.registerNativePlugin(NavBarPlugin.class);
this.registerNativePlugin(PopoverPlugin.class);
this.registerViewNode(RootNode.class);
this.registerViewNode(TextNode.class);

31
Android/doric/src/main/java/pub/doric/plugin/PopoverPlugin.java
View File

@@ -2,12 +2,14 @@ package pub.doric.plugin;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSObject;
import com.github.pengfeizhou.jscore.JSValue;
import com.github.pengfeizhou.jscore.JavaValue;
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.shader.ViewNode;
/**
* @Description: pub.doric.plugin
@@ -22,11 +24,34 @@ public class PopoverPlugin extends DoricJavaPlugin {
}
@DoricMethod
public void show(JSObject jsObject, DoricPromise promise) {
public void show(JSDecoder decoder, DoricPromise promise) {
try {
JSObject jsObject = decoder.decode().asObject();
} catch (Exception e) {
e.printStackTrace();
promise.reject(new JavaValue(e.getLocalizedMessage()));
}
}
@DoricMethod
public void dismiss(JSObject jsObject, DoricPromise promise) {
public void dismiss(JSDecoder decoder, DoricPromise promise) {
try {
JSObject jsObject = decoder.decode().asObject();
JSValue value = jsObject.getProperty("id");
if (value.isString()) {
String viewId = value.asString().value();
ViewNode node = getDoricContext().targetViewNode(viewId);
dismissViewNode(node);
} else {
}
} catch (Exception e) {
e.printStackTrace();
promise.reject(new JavaValue(e.getLocalizedMessage()));
}
}
private void dismissViewNode(ViewNode node) {
}
}

16
Android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java
View File

@@ -15,6 +15,8 @@
*/
package pub.doric.plugin;
import android.text.TextUtils;
import pub.doric.DoricContext;
import pub.doric.async.AsyncResult;
import pub.doric.extension.bridge.DoricMethod;
@@ -55,9 +57,17 @@ public class ShaderPlugin extends DoricJavaPlugin {
getDoricContext().getDriver().asyncCall(new Callable<Object>() {
@Override
public Object call() throws Exception {
String viewId = jsObject.getProperty("id").asString().value();
RootNode rootNode = getDoricContext().getRootNode();
rootNode.setId(jsObject.getProperty("id").asString().value());
rootNode.render(jsObject.getProperty("props").asObject());
if (TextUtils.isEmpty(rootNode.getId())) {
rootNode.setId(viewId);
rootNode.blend(jsObject.getProperty("props").asObject());
} else {
ViewNode viewNode = getDoricContext().targetViewNode(viewId);
if (viewNode != null) {
viewNode.blend(jsObject.getProperty("props").asObject());
}
}
return null;
}
}, ThreadMode.UI).setCallback(new AsyncResult.Callback<Object>() {
@@ -93,7 +103,7 @@ public class ShaderPlugin extends DoricJavaPlugin {
ViewNode viewNode = null;
for (JSValue value : viewIds) {
if (viewNode == null) {
viewNode = getDoricContext().getRootNode();
viewNode = getDoricContext().targetViewNode(value.asString().value());
} else {
if (value.isString() && viewNode instanceof SuperNode) {
String viewId = value.asString().value();

4
Android/doric/src/main/java/pub/doric/shader/RootNode.java
View File

@@ -53,8 +53,4 @@ public class RootNode extends StackNode {
public ViewGroup.LayoutParams getLayoutParams() {
return mView.getLayoutParams();
}
public void render(JSObject props) {
blend(props);
}
}