Dying again

Author: hyb1996

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 118
-        versionName "2.0.8Alpha"
+        versionCode 119
+        versionName "2.0.8 Beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -68,14 +68,13 @@ dependencies {
     compile group: "pl.openrnd.android", name: "multi-level-listview", version: "1.0.1"
     compile 'de.psdev.licensesdialog:licensesdialog:1.8.1'
     compile 'io.mattcarroll.hover:hover:0.9.7'
-    compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
     compile 'com.ashokvarma.android:bottom-navigation-bar:1.4.1'
     compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
     compile 'me.zhanghai.android.materialprogressbar:library:1.3.0'
     compile group:'com.twofortyfouram', name:'android-plugin-client-sdk-for-locale', version:'[4.0.2, 5.0['
     compile 'com.android.volley:volley:1.0.0'
-    compile 'com.github.hyb1996:EnhancedFloaty:0.11'
+    compile 'com.github.hyb1996:EnhancedFloaty:0.12'
     compile 'com.android.support:multidex:1.0.1'
     compile(name: 'libtermexec-release', ext: 'aar')
     compile(name: 'emulatorview-release', ext: 'aar')

app/src/main/AndroidManifest.xml

@@ -84,7 +84,7 @@
             android:theme="@style/IssueReporterTheme"/>
 
         <service android:name="com.stardust.view.Floaty$FloatHeadService"/>
-        <service android:name="com.stardust.scriptdroid.external.floating_window.HoverMenuService"/>
+        <service android:name="com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService"/>
 
         <activity android:name=".external.tasker.TaskPrefEditActivity"/>
 

app/src/main/assets/help/catalogue.json

@@ -40,7 +40,7 @@
       "path":"documentation"
     },
     {
-      "title": "驻留模式与无障碍服务委托",
+      "title": "模块与第三方jar",
       "type": "markdown",
       "path":"documentation"
     },

app/src/main/assets/help/documentation/模块与第三方jar.md

@@ -0,0 +1,23 @@
+### loadJar(path)
+* path \<String\> jar文件路径
+
+载入jar文件。之后改文件的所有类均可直接使用。这在使用第三方库时十分方便。 
+
+### require(path)
+* path \<String\> js文件的相对路径
+
+载入js文件并返回该模块。模块文件应该有module.exports语句指定模块的输出对象。
+
+例如test.js:
+```
+function sayHello(name){
+    print("Hello, " + name);
+}
+module.exports = sayHello;
+```
+同一个目录下的test_module.js:
+```
+var sayHello = require("test");
+sayHello("AutoJs");
+```
+运行这个脚本将在控制台输出"Hello, AutoJs"

app/src/main/assets/modules/ui.js

@@ -14,20 +14,34 @@ gravity
 weight
 
 
+var ui = {
+
+};
+
+ui.layout = function(xml){
+
+}
+
+
+
 ui.layout(
-    <linear orientation="vertical" w="fill" h="300" bg="#ff0000" gravity="center">
-        <text text="测试" size="18" color="#000000"/>
+    <linear orientation="vertical" w="fill" h="300" bg="#ff0000" gravity="center" layout_gravity="center">
+        <text text="测试" size="18" color="#000000" id="adasd"/>
         <button id="btn" text="按钮"/>
     </linear>
 );
 
+
+
+vat text = ui.asadsad;
+
 <relative>
 
 </relative>
 
 <horizon>
 
-</horiz>
+</horizon>
 
 <vertical>
 

app/src/main/assets/sample/JavaScript/HelloWorld.js

@@ -1,2 +1,3 @@
 log("Hello world!!!");
+toast("Hello, AutoJs!");
 openConsole();

app/src/main/assets/sample/文件读写/写入文本文件.js

@@ -0,0 +1,10 @@
+//文件路径
+var path = "/sdcard/1.txt";
+//要写入的文件内容
+var text = "Hello, AutoJs";
+//以写入模式打开文件
+var file = open(path, "w");
+//写入文件
+file.write(text);
+//关闭文件
+file.close();

app/src/main/assets/sample/文件读写/文件编码转换(高级).js

@@ -0,0 +1,20 @@
+
+
+convert("/sdcard/1.txt", "utf-8", "/sdcard/2.txt", "gbk");
+
+/**
+ * fromFile: 源文件路径
+ * fromEncoding: 源文件编码
+ * toFile: 输出文件路径
+ * toEncoding: 输出文件编码
+ */
+function convert(fromFile, fromEncoding, toFile, toEncoding){
+    fromFile = open(fromFile, "r", fromEncoding);
+    toFile = open(toFile, "w", toEncoding);
+    while(true){
+        var line = fromFile.readline();
+        if(!line)
+            break;
+        toFile.writeline(line);
+    }
+}

app/src/main/assets/sample/文件读写/文件编码转换.js

@@ -0,0 +1,13 @@
+//以UTF-8编码打开SD卡上的1.txt文件
+var in = open("/sdcard/1.txt", "r", "utf-8");
+//读取文件所有内容
+var text = in.read();
+//关闭文件
+in.close();
+//以gbk编码打开SD卡上的2.txt文件
+var out = open("/sdcard/2.txt", "w", "gbk");
+//写入内容
+out.write(text);
+//关闭文件
+out.close();
+

app/src/main/assets/sample/文件读写/读写文本文件.js

@@ -0,0 +1,37 @@
+//以写入模式打开SD卡根目录文件1.txt
+var file = open("/sdcard/1.txt", "w")
+//写入aaaa
+file.write("aaaa");
+//写入bbbbb后换行
+file.writeline("bbbbb");
+//写入ccc与ddd两行
+file.writelines(["ccc", "ddd"]);
+//关闭文件
+file.close();
+
+//以附加模式打开文件
+file = open("/sdcard/1.txt", "a");
+//附加一行"啦啦啦啦"
+file.writeline("啦啦啦啦");
+//附加一行"哈哈哈哈"
+file.writeline("哈哈哈哈");
+//附加两行ccc, ddd
+file.writelines(["ccc", "ddd"]);
+//输出缓冲区
+file.flush();
+//关闭文件
+file.close();
+
+
+//以读取模式打开文件
+file = open("/sdcard/test.txt", "r")
+//读取一行并打印
+print(file.readline());
+//读取剩余所有行并打印
+for each(line in file.readlines()){
+  print(line)
+}
+file.close()
+
+//显示控制台
+console.show()