CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-21 21:01:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: crash of ui script

Browse Source
This commit is contained in:
hyb1996 2017-10-28 19:20:15 +08:00
parent b6b204a057
commit 2c7ede3e1c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autojs/src/main/assets/modules/__ui__.js
View File

@ -98,4 +98,4 @@ module.exports = function(__runtime__, scope){
}
};
return proxy;
}
}

21
autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
View File

@ -1,5 +1,12 @@
package com.stardust.autojs.core.ui.xml;
import com.stardust.autojs.core.ui.widget.JsButton;
import com.stardust.autojs.core.ui.widget.JsEditText;
import com.stardust.autojs.core.ui.widget.JsFrameLayout;
import com.stardust.autojs.core.ui.widget.JsLinearLayout;
import com.stardust.autojs.core.ui.widget.JsRelativeLayout;
import com.stardust.autojs.core.ui.widget.JsTextView;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@ -21,14 +28,14 @@ import javax.xml.parsers.ParserConfigurationException;
public class XmlConverter {
private static final NodeHandler NODE_HANDLER = new NodeHandler.NameRouter()
.handler("vertical", new NodeHandler.VerticalHandler("com.stardust.autojs.runtime.api.ui.widget.JsLinearLayout"))
.handler("vertical", new NodeHandler.VerticalHandler(JsLinearLayout.class.getName()))
.defaultHandler(new NodeHandler.MapNameHandler()
.map("frame", "com.stardust.autojs.runtime.api.ui.widget.JsFrameLayout")
.map("linear", "com.stardust.autojs.runtime.api.ui.widget.JsLinearLayout")
.map("relative", "com.stardust.autojs.runtime.api.ui.widget.JsRelativeLayout")
.map("button", "com.stardust.autojs.runtime.api.ui.widget.JsButton")
.map("text", "com.stardust.autojs.runtime.api.ui.widget.JsTextView")
.map("input", "com.stardust.autojs.runtime.api.ui.widget.JsEditText")
.map("frame", JsFrameLayout.class.getName())
.map("linear", JsLinearLayout.class.getName())
.map("relative", JsRelativeLayout.class.getName())
.map("button", JsButton.class.getName())
.map("text", JsTextView.class.getName())
.map("input", JsEditText.class.getName())
.map("image", "ImageView")
);

2
autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java
View File

@ -39,7 +39,7 @@ public class ScriptExecuteActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
IntentExtras extras = IntentExtras.fromIntent(getIntent());
if (extras == null || extras.get(EXTRA_EXECUTION) == null) {
if (extras.get(EXTRA_EXECUTION) == null) {
finish();
return;
}