From 997b652df91395051600d76060f7a7f7b562a484 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sun, 3 Jun 2018 21:07:11 +0800
Subject: [PATCH] fix(app): change documentation source and refresh cannot
 apply changes immediately docs: update to latest

---
 .idea/caches/build_file_checksums.ser         | Bin 733 -> 733 bytes
 app/release/output.json                       |   2 +-
 app/src/main/assets/docs/all.html             |  36 ++++++++++++++----
 app/src/main/assets/docs/globals.html         |   2 +-
 .../autojs/autojs/ui/doc/DocsFragment.java    |  22 ++++++++++-
 .../ui/settings/ScriptDirPathPreference.java  |  10 -----
 .../org/autojs/autojs/ui/widget/EWebView.java |   4 ++
 inrt/build.gradle                             |   4 +-
 8 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 49282b084a62ebccd2719ce9f415a5ad665161cc..ac14c79fcc511fe9c4d42a77babe79519ff2ebe6 100644
GIT binary patch
delta 36
ucmV+<0NelF1>FUZm;}XDZa1-<(g6@;J^A4y19_Z2v!WXn`f2r(ega=AMi3(a

delta 36
ucmV+<0NelF1>FUZm;}UN3jnd4(g6@pJ-7I!sC_>|${Ov;W)A$5ega=6yAV?V

diff --git a/app/release/output.json b/app/release/output.json
index f5c38b25..2bcc50bc 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":201},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":203},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}]
\ No newline at end of file
diff --git a/app/src/main/assets/docs/all.html b/app/src/main/assets/docs/all.html
index ff284e87..1920eb19 100644
--- a/app/src/main/assets/docs/all.html
+++ b/app/src/main/assets/docs/all.html
@@ -226,6 +226,9 @@
 <li><span class="stability_undefined"><a href="#dialogs_multi_choice">事件: <code>multi_choice</code></a></span></li>
 <li><span class="stability_undefined"><a href="#dialogs_input">事件: <code>input</code></a></span></li>
 <li><span class="stability_undefined"><a href="#dialogs_input_change">事件: <code>input_change</code></a></span></li>
+<li><span class="stability_undefined"><a href="#dialogs_dialog_getprogress">dialog.getProgress()</a></span></li>
+<li><span class="stability_undefined"><a href="#dialogs_dialog_getmaxprogress">dialog.getMaxProgress()</a></span></li>
+<li><span class="stability_undefined"><a href="#dialogs_dialog_getactionbutton_action">dialog.getActionButton(action)</a></span></li>
 </ul>
 </li>
 <li><span class="stability_2"><a href="#engines_engines">Engines</a></span><ul>
@@ -1867,11 +1870,11 @@ dialogs.select(&quot;请选择一个选项&quot;, [&quot;选项A&quot;, &quot;
 <li><code>itemsColor</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a> 对话框列表的选项的文字颜色</li>
 <li><code>itemsSelectMode</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> 对话框列表的选项选择模式，可以为:<ul>
 <li><code>select</code> 普通选择模式</li>
-<li><code>singleChoice</code> 单选模式</li>
-<li><code>multiChoice</code> 多选模式</li>
+<li><code>single</code> 单选模式</li>
+<li><code>multi</code> 多选模式</li>
 </ul>
 </li>
-<li><code>itemsSelectedIndex</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array" class="type">&lt;Array&gt;</a> 对话框列表中？？？</li>
+<li><code>itemsSelectedIndex</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array" class="type">&lt;Array&gt;</a> 对话框列表中预先选中的项目索引，如果是单选模式为一个索引；多选模式则为数组</li>
 <li><code>positive</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> 对话框确定按钮的文字内容(最右边按钮)</li>
 <li><code>positiveColor</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a> 对话框确定按钮的文字颜色(最右边按钮)</li>
 <li><code>neutral</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> 对话框中立按钮的文字内容(最左边按钮)</li>
@@ -1913,9 +1916,9 @@ dialogs.select(&quot;请选择一个选项&quot;, [&quot;选项A&quot;, &quot;
 <pre><code>dialogs.build({
     title: &quot;单选&quot;,
     items: [&quot;选项1&quot;, &quot;选项2&quot;, &quot;选项3&quot;, &quot;选项4&quot;],
-    itemsSelectMode: &quot;singleChoice&quot;,
+    itemsSelectMode: &quot;single&quot;,
     itemsSelectedIndex: 3
-}).on(&quot;item_select&quot;, (index, item)-&gt;{
+}).on(&quot;single_choice&quot;, (index, item)=&gt;{
     toast(&quot;您选择的是&quot; + item);
 }).show();
 </code></pre><p>&quot;处理中&quot;对话框:</p>
@@ -2124,7 +2127,26 @@ setTimeout(()=&gt;{
 }).on(&quot;input_change&quot;, (text, dialog)=&gt;{
     toast(&quot;你输入的是&quot; + text);
 }).show();
-</code></pre><!-- [end-include:dialogs.md] -->
+</code></pre><h2>dialog.getProgress()<span><a class="mark" href="#dialogs_dialog_getprogress" id="dialogs_dialog_getprogress">#</a></span></h2>
+<div class="signature"><ul>
+<li>返回 <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a></li>
+</ul>
+</div><p>获取当前进度条的进度值，是一个整数</p>
+<h2>dialog.getMaxProgress()<span><a class="mark" href="#dialogs_dialog_getmaxprogress" id="dialogs_dialog_getmaxprogress">#</a></span></h2>
+<div class="signature"><ul>
+<li>返回 <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type" class="type">&lt;number&gt;</a></li>
+</ul>
+</div><p>获取当前进度条的最大进度值，是一个整数</p>
+<h2>dialog.getActionButton(action)<span><a class="mark" href="#dialogs_dialog_getactionbutton_action" id="dialogs_dialog_getactionbutton_action">#</a></span></h2>
+<div class="signature"><ul>
+<li><code>action</code> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type" class="type">&lt;string&gt;</a> 动作，包括:<ul>
+<li><code>positive</code> </li>
+<li><code>negative</code></li>
+<li><code>neutral</code></li>
+</ul>
+</li>
+</ul>
+</div><!-- [end-include:dialogs.md] -->
 <!-- [start-include:engines.md] -->
 <h1>Engines<span><a class="mark" href="#engines_engines" id="engines_engines">#</a></span></h1>
 <div class="api_stability api_stability_2"><a href="documentation.html#documentation_stability_index">Stability: 2</a> - Stable</div><p>engines模块包含了一些与脚本环境、脚本运行、脚本引擎有关的函数，包括运行其他脚本，关闭脚本等。</p>
@@ -3267,7 +3289,7 @@ for(var i = 0; i &lt; 100; i++){
 </ul>
 </div><p>动态申请安卓的权限。例如：</p>
 <pre><code>//请求GPS权限
-runtime.requestPermission([&quot;access_fine_location&quot;]);
+runtime.requestPermissions([&quot;access_fine_location&quot;]);
 </code></pre><p>尽管安卓有很多权限，但必须写入Manifest才能动态申请，为了防止权限的滥用，目前Auto.js只能额外申请两个权限：</p>
 <ul>
 <li><code>access_fine_location</code> GPS权限</li>
diff --git a/app/src/main/assets/docs/globals.html b/app/src/main/assets/docs/globals.html
index 4d60caa3..0635fe44 100644
--- a/app/src/main/assets/docs/globals.html
+++ b/app/src/main/assets/docs/globals.html
@@ -224,7 +224,7 @@ for(var i = 0; i &lt; 100; i++){
 </ul>
 </div><p>动态申请安卓的权限。例如：</p>
 <pre><code>//请求GPS权限
-runtime.requestPermission([&quot;access_fine_location&quot;]);
+runtime.requestPermissions([&quot;access_fine_location&quot;]);
 </code></pre><p>尽管安卓有很多权限，但必须写入Manifest才能动态申请，为了防止权限的滥用，目前Auto.js只能额外申请两个权限：</p>
 <ul>
 <li><code>access_fine_location</code> GPS权限</li>
diff --git a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
index 75988997..36cc9987 100644
--- a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
@@ -4,13 +4,17 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.text.TextUtils;
 import android.webkit.WebView;
 
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.main.QueryEvent;
 import org.autojs.autojs.ui.main.ViewPagerFragment;
+
 import com.stardust.util.BackPressedHandler;
+
 import org.autojs.autojs.ui.widget.EWebView;
 
 import org.androidannotations.annotations.AfterViews;
@@ -48,15 +52,29 @@ public class DocsFragment extends ViewPagerFragment implements BackPressedHandle
     @AfterViews
     void setUpViews() {
         mWebView = mEWebView.getWebView();
-        String url = Pref.getDocumentationUrl() + "index.html";
+        mEWebView.getSwipeRefreshLayout().setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                if (TextUtils.equals(mWebView.getUrl(), mWebView.getOriginalUrl())) {
+                    loadUrl();
+                } else {
+                    mEWebView.onRefresh();
+                }
+            }
+        });
         Bundle savedWebViewState = getArguments().getBundle("savedWebViewState");
         if (savedWebViewState != null) {
             mWebView.restoreState(savedWebViewState);
         } else {
-            mWebView.loadUrl(getArguments().getString(ARGUMENT_URL, url));
+            loadUrl();
         }
     }
 
+    private void loadUrl() {
+        String url = Pref.getDocumentationUrl() + "index.html";
+        mWebView.loadUrl(getArguments().getString(ARGUMENT_URL, url));
+    }
+
 
     @Override
     public void onResume() {
diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
index ca640331..34479769 100644
--- a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
+++ b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
@@ -2,7 +2,6 @@ package org.autojs.autojs.ui.settings;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.text.Editable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -13,22 +12,17 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.prefs.MaterialEditTextPreference;
-import com.stardust.pio.PFiles;
 
-import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 import org.autojs.autojs.storage.file.FileObservable;
 import org.autojs.autojs.storage.file.StorageFileProvider;
 import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
 import org.autojs.autojs.tool.SimpleObserver;
-import org.autojs.autojs.ui.widget.SimpleTextWatcher;
 
 import java.io.File;
 
 import io.reactivex.Observable;
-import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
 public class ScriptDirPathPreference extends MaterialEditTextPreference {
@@ -55,13 +49,9 @@ public class ScriptDirPathPreference extends MaterialEditTextPreference {
     protected void onAddEditTextToDialogView(@NonNull View dialogView, @NonNull EditText editText) {
         super.onAddEditTextToDialogView(dialogView, editText);
         mRadioGroup = (RadioGroup) View.inflate(getContext(), R.layout.script_dir_pref_radio_group, null);
-        editText.addTextChangedListener(new SimpleTextWatcher(this::verifyInput));
         ((ViewGroup) dialogView).addView(mRadioGroup);
     }
 
-    private void verifyInput(Editable text) {
-
-    }
 
     @Override
     protected void onDialogClosed(boolean positiveResult) {
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
index 7dbc24e9..7340072c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
@@ -60,6 +60,9 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
         init();
     }
 
+    public SwipeRefreshLayout getSwipeRefreshLayout() {
+        return mSwipeRefreshLayout;
+    }
 
     private void init() {
         inflate(getContext(), R.layout.ewebview, this);
@@ -95,6 +98,7 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
         }
     }
 
+    @SuppressLint("CheckResult")
     @Override
     public void onRefresh() {
         mWebView.reload();
diff --git a/inrt/build.gradle b/inrt/build.gradle
index 330c3a20..02ff13fd 100644
--- a/inrt/build.gradle
+++ b/inrt/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.stardust.auojs.inrt"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 201
-        versionName "4.0.0 Alpha1"
+        versionCode 203
+        versionName "4.0.0 Beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi-v7a'