diff --git a/app/build.gradle b/app/build.gradle
index 4988d0ab..8a6d71b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,15 +8,14 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 116
-        versionName "2.0.7 Alpha3"
+        versionCode 118
+        versionName "2.0.8Alpha"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
-
     }
     buildTypes {
         release {
-            shrinkResources true
+            shrinkResources false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -76,6 +75,7 @@ dependencies {
     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(name: 'libtermexec-release', ext: 'aar')
     compile(name: 'emulatorview-release', ext: 'aar')
     compile(name: 'term-debug', ext: 'aar')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24b32e70..19671223 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
+
     <application
         xmlns:tools="http://schemas.android.com/tools"
         android:name=".App"
diff --git a/app/src/main/assets/js/jsbeautify.js b/app/src/main/assets/js/jsbeautify.js
new file mode 100644
index 00000000..cbd7af26
--- /dev/null
+++ b/app/src/main/assets/js/jsbeautify.js
@@ -0,0 +1,973 @@
+
+/*jslint onevar: false, plusplus: false */
+/*
+
+ JS Beautifier
+---------------
+
+
+  Written by Einar Lielmanis, <einars@gmail.com>
+      http://jsbeautifier.org/
+
+  Originally converted to javascript by Vital, <vital76@gmail.com>
+
+  You are free to use this in any way you want, in case you find this useful or working for you.
+
+  Usage:
+    js_beautify(js_source_text);
+    js_beautify(js_source_text, options);
+
+  The options are:
+    indent_size (default 4) �� indentation size,
+    indent_char (default space) �� character to indent with,
+    preserve_newlines (default true) �� whether existing line breaks should be preserved,
+    indent_level (default 0)  �� initial indentation level, you probably won't need this ever,
+
+    space_after_anon_function (default false) �� if true, then space is added between "function ()"
+            (jslint is happy about this); if false, then the common "function()" output is used.
+
+    e.g
+
+    js_beautify(js_source_text, {indent_size: 1, indent_char: '\t'});
+
+
+*/
+
+function js_beautify(js_source_text, options) {
+
+    var input, output, token_text, last_type, last_text, last_last_text, last_word, flags, flag_store, indent_string;
+    var whitespace, wordchar, punct, parser_pos, line_starters, digits;
+    var prefix, token_type, do_block_just_closed;
+    var indent_level, wanted_newline, just_added_newline, n_newlines;
+
+
+    options = options || {};
+    var opt_indent_size = options.indent_size || 4;
+    var opt_indent_char = options.indent_char || ' ';
+    var opt_preserve_newlines = typeof options.preserve_newlines === 'undefined' ? true : options.preserve_newlines;
+    var opt_indent_level = options.indent_level || 0; // starting indentation
+    var opt_space_after_anon_function = options.space_after_anon_function === 'undefined' ? false : options.space_after_anon_function;
+    var opt_keep_array_indentation = typeof options.keep_array_indentation === 'undefined' ? true : options.keep_array_indentation;
+
+    just_added_newline = false;
+
+
+    function trim_output() {
+        while (output.length && (output[output.length - 1] === ' ' || output[output.length - 1] === indent_string)) {
+            output.pop();
+        }
+    }
+
+    function print_newline(ignore_repeated) {
+
+        if (opt_keep_array_indentation && is_array(flags.mode)) {
+            return;
+        }
+
+        ignore_repeated = typeof ignore_repeated === 'undefined' ? true : ignore_repeated;
+
+        flags.if_line = false;
+        trim_output();
+
+        if (!output.length) {
+            return; // no newline on start of file
+        }
+
+        if (output[output.length - 1] !== "\n" || !ignore_repeated) {
+            just_added_newline = true;
+            output.push("\n");
+        }
+        for (var i = 0; i < indent_level; i += 1) {
+            output.push(indent_string);
+        }
+    }
+
+
+
+    function print_single_space() {
+        var last_output = ' ';
+        if (output.length) {
+            last_output = output[output.length - 1];
+        }
+        if (last_output !== ' ' && last_output !== '\n' && last_output !== indent_string) { // prevent occassional duplicate space
+            output.push(' ');
+        }
+    }
+
+
+    function print_token() {
+        just_added_newline = false;
+        output.push(token_text);
+    }
+
+    function indent() {
+        indent_level += 1;
+    }
+
+
+    function unindent() {
+        if (indent_level) {
+            indent_level -= 1;
+        }
+    }
+
+
+    function remove_indent() {
+        if (output.length && output[output.length - 1] === indent_string) {
+            output.pop();
+        }
+    }
+
+    function print_javadoc_comment() {
+        var lines = token_text.split('\n');
+        output.push(lines[0]);
+        for (var i = 1; i < lines.length; i++) {
+            print_newline();
+            output.push(' ');
+            output.push(lines[i].replace(/^\s+/, ''));
+        }
+    }
+
+
+    function set_mode(mode) {
+        if (flags) {
+            flag_store.push(flags);
+        }
+        flags = {
+            mode: mode,
+            var_line: false,
+            var_line_tainted: false,
+            if_line: false,
+            in_case: false,
+            indentation_baseline: -1
+        };
+    }
+
+    function is_expression(mode) {
+        return mode === '[EXPRESSION]' || mode === '[INDENTED-EXPRESSION]' || mode === '(EXPRESSION)';
+    }
+
+    function is_array(mode) {
+        return mode === '[EXPRESSION]' || mode === '[INDENTED-EXPRESSION]';
+    }
+
+    function restore_mode() {
+        do_block_just_closed = flags.mode === 'DO_BLOCK';
+        if (flag_store.length > 0) {
+            flags = flag_store.pop();
+        }
+    }
+
+
+    function in_array(what, arr) {
+        for (var i = 0; i < arr.length; i += 1) {
+            if (arr[i] === what) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Walk backwards from the colon to find a '?' (colon is part of a ternary op)
+    // or a '{' (colon is part of a class literal).  Along the way, keep track of
+    // the blocks and expressions we pass so we only trigger on those chars in our
+    // own level, and keep track of the colons so we only trigger on the matching '?'.
+
+
+    function is_ternary_op() {
+        var level = 0,
+            colon_count = 0;
+        for (var i = output.length - 1; i >= 0; i--) {
+            switch (output[i]) {
+            case ':':
+                if (level === 0) {
+                    colon_count++;
+                }
+                break;
+            case '?':
+                if (level === 0) {
+                    if (colon_count === 0) {
+                        return true;
+                    } else {
+                        colon_count--;
+                    }
+                }
+                break;
+            case '{':
+                if (level === 0) {
+                    return false;
+                }
+                level--;
+                break;
+            case '(':
+            case '[':
+                level--;
+                break;
+            case ')':
+            case ']':
+            case '}':
+                level++;
+                break;
+            }
+        }
+    }
+
+
+    function get_next_token() {
+        n_newlines = 0;
+
+        if (parser_pos >= input.length) {
+            return ['', 'TK_EOF'];
+        }
+
+        var c = input.charAt(parser_pos);
+        parser_pos += 1;
+
+
+        var keep_whitespace = opt_keep_array_indentation && is_array(flags.mode);
+        wanted_newline = false;
+
+        if (keep_whitespace) {
+
+            //
+            // slight mess to allow nice preservation of array indentation and reindent that correctly
+            // first time when we get to the arrays:
+            // var a = [
+            // ....'something'
+            // we make note of whitespace_count = 4 into flags.indentation_baseline
+            // so we know that 4 whitespaces in original source match indent_level of reindented source
+            //
+            // and afterwards, when we get to
+            //    'something,
+            // .......'something else'
+            // we know that this should be indented to indent_level + (7 - indentation_baseline) spaces
+            //
+            var whitespace_count = 0;
+
+            while (in_array(c, whitespace)) {
+
+                if (c === "\n") {
+                    trim_output();
+                    output.push("\n");
+                    just_added_newline = true;
+                    whitespace_count = 0;
+                } else {
+                    if (c === '\t') {
+                        whitespace_count += 4;
+                    } else {
+                        whitespace_count += 1;
+                    }
+                }
+
+                if (parser_pos >= input.length) {
+                    return ['', 'TK_EOF'];
+                }
+
+                c = input.charAt(parser_pos);
+                parser_pos += 1;
+
+            }
+            if (flags.indentation_baseline === -1) {
+                flags.indentation_baseline = whitespace_count;
+            }
+
+            if (just_added_newline) {
+                for (var i = 0; i < indent_level + 1; i += 1) {
+                    output.push(indent_string);
+                }
+                if (flags.indentation_baseline !== -1) {
+                    for (var i = 0; i < whitespace_count - flags.indentation_baseline; i++) {
+                        output.push(' ');
+                    }
+                }
+            }
+
+        } else {
+            while (in_array(c, whitespace)) {
+
+                if (c === "\n") {
+                    n_newlines += 1;
+                }
+
+
+                if (parser_pos >= input.length) {
+                    return ['', 'TK_EOF'];
+                }
+
+                c = input.charAt(parser_pos);
+                parser_pos += 1;
+
+            }
+
+            if (opt_preserve_newlines) {
+                if (n_newlines > 1) {
+                    for (var i = 0; i < n_newlines; i += 1) {
+                        print_newline(i === 0);
+                        just_added_newline = true;
+                    }
+                }
+            }
+            wanted_newline = n_newlines > 0;
+        }
+
+
+        if (in_array(c, wordchar)) {
+            if (parser_pos < input.length) {
+                while (in_array(input.charAt(parser_pos), wordchar)) {
+                    c += input.charAt(parser_pos);
+                    parser_pos += 1;
+                    if (parser_pos === input.length) {
+                        break;
+                    }
+                }
+            }
+
+            // small and surprisingly unugly hack for 1E-10 representation
+            if (parser_pos !== input.length && c.match(/^[0-9]+[Ee]$/) && (input.charAt(parser_pos) === '-' || input.charAt(parser_pos) === '+')) {
+
+                var sign = input.charAt(parser_pos);
+                parser_pos += 1;
+
+                var t = get_next_token(parser_pos);
+                c += sign + t[0];
+                return [c, 'TK_WORD'];
+            }
+
+            if (c === 'in') { // hack for 'in' operator
+                return [c, 'TK_OPERATOR'];
+            }
+            if (wanted_newline && last_type !== 'TK_OPERATOR' && !flags.if_line && (opt_preserve_newlines || last_text !== 'var')) {
+                print_newline();
+            }
+            return [c, 'TK_WORD'];
+        }
+
+        if (c === '(' || c === '[') {
+            return [c, 'TK_START_EXPR'];
+        }
+
+        if (c === ')' || c === ']') {
+            return [c, 'TK_END_EXPR'];
+        }
+
+        if (c === '{') {
+            return [c, 'TK_START_BLOCK'];
+        }
+
+        if (c === '}') {
+            return [c, 'TK_END_BLOCK'];
+        }
+
+        if (c === ';') {
+            return [c, 'TK_SEMICOLON'];
+        }
+
+        if (c === '/') {
+            var comment = '';
+            // peek for comment /* ... */
+            if (input.charAt(parser_pos) === '*') {
+                parser_pos += 1;
+                if (parser_pos < input.length) {
+                    while (! (input.charAt(parser_pos) === '*' && input.charAt(parser_pos + 1) && input.charAt(parser_pos + 1) === '/') && parser_pos < input.length) {
+                        comment += input.charAt(parser_pos);
+                        parser_pos += 1;
+                        if (parser_pos >= input.length) {
+                            break;
+                        }
+                    }
+                }
+                parser_pos += 2;
+                return ['/*' + comment + '*/', 'TK_BLOCK_COMMENT'];
+            }
+            // peek for comment // ...
+            if (input.charAt(parser_pos) === '/') {
+                comment = c;
+                while (input.charAt(parser_pos) !== "\x0d" && input.charAt(parser_pos) !== "\x0a") {
+                    comment += input.charAt(parser_pos);
+                    parser_pos += 1;
+                    if (parser_pos >= input.length) {
+                        break;
+                    }
+                }
+                parser_pos += 1;
+                if (wanted_newline) {
+                    print_newline();
+                }
+                return [comment, 'TK_COMMENT'];
+            }
+
+        }
+
+        if (c === "'" || // string
+        c === '"' || // string
+        (c === '/' && ((last_type === 'TK_WORD' && in_array(last_text, ['return', 'do'])) || (last_type === 'TK_START_EXPR' || last_type === 'TK_START_BLOCK' || last_type === 'TK_END_BLOCK' || last_type === 'TK_OPERATOR' || last_type === 'TK_EOF' || last_type === 'TK_SEMICOLON')))) { // regexp
+            var sep = c;
+            var esc = false;
+            var resulting_string = c;
+
+            if (parser_pos < input.length) {
+                if (sep === '/') {
+                    //
+                    // handle regexp separately...
+                    //
+                    var in_char_class = false;
+                    while (esc || in_char_class || input.charAt(parser_pos) !== sep) {
+                        resulting_string += input.charAt(parser_pos);
+                        if (!esc) {
+                            esc = input.charAt(parser_pos) === '\\';
+                            if (input.charAt(parser_pos) === '[') {
+                                in_char_class = true;
+                            } else if (input.charAt(parser_pos) === ']') {
+                                in_char_class = false;
+                            }
+                        } else {
+                            esc = false;
+                        }
+                        parser_pos += 1;
+                        if (parser_pos >= input.length) {
+                            // incomplete string/rexp when end-of-file reached. 
+                            // bail out with what had been received so far.
+                            return [resulting_string, 'TK_STRING'];
+                        }
+                    }
+
+                } else {
+                    //
+                    // and handle string also separately
+                    //
+                    while (esc || input.charAt(parser_pos) !== sep) {
+                        resulting_string += input.charAt(parser_pos);
+                        if (!esc) {
+                            esc = input.charAt(parser_pos) === '\\';
+                        } else {
+                            esc = false;
+                        }
+                        parser_pos += 1;
+                        if (parser_pos >= input.length) {
+                            // incomplete string/rexp when end-of-file reached. 
+                            // bail out with what had been received so far.
+                            return [resulting_string, 'TK_STRING'];
+                        }
+                    }
+                }
+
+
+
+            }
+
+            parser_pos += 1;
+
+            resulting_string += sep;
+
+            if (sep === '/') {
+                // regexps may have modifiers /regexp/MOD , so fetch those, too
+                while (parser_pos < input.length && in_array(input.charAt(parser_pos), wordchar)) {
+                    resulting_string += input.charAt(parser_pos);
+                    parser_pos += 1;
+                }
+            }
+            return [resulting_string, 'TK_STRING'];
+        }
+
+        if (c === '#') {
+            // Spidermonkey-specific sharp variables for circular references
+            // https://developer.mozilla.org/En/Sharp_variables_in_JavaScript
+            // http://mxr.mozilla.org/mozilla-central/source/js/src/jsscan.cpp around line 1935
+            var sharp = '#';
+            if (parser_pos < input.length && in_array(input.charAt(parser_pos), digits)) {
+                do {
+                    c = input.charAt(parser_pos);
+                    sharp += c;
+                    parser_pos += 1;
+                } while (parser_pos < input.length && c !== '#' && c !== '=');
+                if (c === '#') {
+                    return [sharp, 'TK_WORD'];
+                } else {
+                    return [sharp, 'TK_OPERATOR'];
+                }
+            }
+        }
+
+        if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
+            parser_pos += 3;
+            return ['<!--', 'TK_COMMENT'];
+        }
+
+        if (c === '-' && input.substring(parser_pos - 1, parser_pos + 2) === '-->') {
+            parser_pos += 2;
+            if (wanted_newline) {
+                print_newline();
+            }
+            return ['-->', 'TK_COMMENT'];
+        }
+
+        if (in_array(c, punct)) {
+            while (parser_pos < input.length && in_array(c + input.charAt(parser_pos), punct)) {
+                c += input.charAt(parser_pos);
+                parser_pos += 1;
+                if (parser_pos >= input.length) {
+                    break;
+                }
+            }
+
+            return [c, 'TK_OPERATOR'];
+        }
+
+        return [c, 'TK_UNKNOWN'];
+    }
+
+    //----------------------------------
+    indent_string = '';
+    while (opt_indent_size > 0) {
+        indent_string += opt_indent_char;
+        opt_indent_size -= 1;
+    }
+
+    indent_level = opt_indent_level;
+
+    input = js_source_text;
+
+    last_word = ''; // last 'TK_WORD' passed
+    last_type = 'TK_START_EXPR'; // last token type
+    last_text = ''; // last token text
+    last_last_text = ''; // pre-last token text
+    output = [];
+
+    do_block_just_closed = false;
+
+    whitespace = "\n\r\t ".split('');
+    wordchar = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'.split('');
+    digits = '0123456789'.split('');
+
+    // <!-- is a special case (ok, it's a minor hack actually)
+    punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! !! , : ? ^ ^= |= ::'.split(' ');
+
+    // words which should always start on new line.
+    line_starters = 'continue,try,throw,return,var,if,switch,case,default,for,while,break,function'.split(',');
+
+    // states showing if we are currently in expression (i.e. "if" case) - 'EXPRESSION', or in usual block (like, procedure), 'BLOCK'.
+    // some formatting depends on that.
+    flag_store = [];
+    set_mode('BLOCK');
+
+    parser_pos = 0;
+    while (true) {
+        var t = get_next_token(parser_pos);
+        token_text = t[0];
+        token_type = t[1];
+        if (token_type === 'TK_EOF') {
+            break;
+        }
+
+        switch (token_type) {
+
+        case 'TK_START_EXPR':
+
+            if (token_text === '[') {
+
+                if (last_type === 'TK_WORD' || last_text === ')') {
+                    // this is array index specifier, break immediately
+                    // a[x], fn()[x]
+                    if (last_word === 'return' || last_word === 'throw') {
+                        print_single_space();
+                    }
+                    set_mode('(EXPRESSION)');
+                    print_token();
+                    break;
+                }
+
+                if (flags.mode === '[EXPRESSION]' || flags.mode === '[INDENTED-EXPRESSION]') {
+                    if (last_last_text === ']' && last_text === ',') {
+                        // ], [ goes to new line
+                        if (flags.mode === '[EXPRESSION]') {
+                            if (!opt_keep_array_indentation) {
+                                indent();
+                            }
+                            flags.mode = '[INDENTED-EXPRESSION]';
+                        }
+                        if (!opt_keep_array_indentation) {
+                            print_newline();
+                        }
+                        set_mode('[EXPRESSION]');
+                    } else if (last_text === '[') {
+                        if (flags.mode === '[EXPRESSION]') {
+                            if (!opt_keep_array_indentation) {
+                                indent();
+                            }
+                            flags.mode = '[INDENTED-EXPRESSION]';
+                        }
+                        if (!opt_keep_array_indentation) {
+                            print_newline();
+                        }
+                        set_mode('[EXPRESSION]');
+                    } else {
+                        set_mode('[EXPRESSION]');
+                    }
+                } else {
+                    set_mode('[EXPRESSION]');
+                }
+
+
+
+            } else {
+                set_mode('(EXPRESSION)');
+            }
+
+            if (last_text === ';' || last_type === 'TK_START_BLOCK') {
+                print_newline();
+            } else if (last_type === 'TK_END_EXPR' || last_type === 'TK_START_EXPR' || last_type === 'TK_END_BLOCK') {
+                // do nothing on (( and )( and ][ and ]( ..
+            } else if (last_type !== 'TK_WORD' && last_type !== 'TK_OPERATOR') {
+                print_single_space();
+            } else if (last_word === 'function') {
+                // function() vs function ()
+                if (opt_space_after_anon_function) {
+                    print_single_space();
+                }
+            } else if (in_array(last_word, line_starters)) {
+                print_single_space();
+            }
+            print_token();
+
+            break;
+
+        case 'TK_END_EXPR':
+            if (token_text === ']') {
+                if (flags.mode === '[INDENTED-EXPRESSION]') {
+                    unindent();
+                    if (last_text === ']') {
+                        print_newline();
+                    }
+                }
+            }
+            restore_mode();
+            print_token();
+            break;
+
+        case 'TK_START_BLOCK':
+
+            if (last_word === 'do') {
+                set_mode('DO_BLOCK');
+            } else {
+                set_mode('BLOCK');
+            }
+            if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') {
+                if (last_type === 'TK_START_BLOCK') {
+                    print_newline();
+                } else {
+                    print_single_space();
+                }
+            }
+            print_token();
+            indent();
+            break;
+
+        case 'TK_END_BLOCK':
+            if (last_type === 'TK_START_BLOCK') {
+                // nothing
+                if (just_added_newline) {
+                    remove_indent();
+                    // {
+                    //
+                    // }
+                } else {
+                    // {}
+                    trim_output();
+                }
+                unindent();
+            } else {
+                unindent();
+                print_newline();
+            }
+            print_token();
+            restore_mode();
+            break;
+
+        case 'TK_WORD':
+
+            // no, it's not you. even I have problems understanding how this works
+            // and what does what.
+            if (do_block_just_closed) {
+                // do {} ## while ()
+                print_single_space();
+                print_token();
+                print_single_space();
+                do_block_just_closed = false;
+                break;
+            }
+
+            if (token_text === 'function') {
+                if ((just_added_newline || last_text == ';') && last_text !== '{') {
+                    // make sure there is a nice clean space of at least one blank line
+                    // before a new function definition
+                    n_newlines = just_added_newline ? n_newlines : 0;
+
+                    for (var i = 0; i < 2 - n_newlines; i++) {
+                        print_newline(false);
+                    }
+
+                }
+            }
+            if (token_text === 'case' || token_text === 'default') {
+                if (last_text === ':') {
+                    // switch cases following one another
+                    remove_indent();
+                } else {
+                    // case statement starts in the same line where switch
+                    unindent();
+                    print_newline();
+                    indent();
+                }
+                print_token();
+                flags.in_case = true;
+                break;
+            }
+
+            prefix = 'NONE';
+
+            if (last_type === 'TK_END_BLOCK') {
+                if (!in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
+                    prefix = 'NEWLINE';
+                } else {
+                    prefix = 'SPACE';
+                    print_single_space();
+                }
+            } else if (last_type === 'TK_SEMICOLON' && (flags.mode === 'BLOCK' || flags.mode === 'DO_BLOCK')) {
+                prefix = 'NEWLINE';
+            } else if (last_type === 'TK_SEMICOLON' && is_expression(flags.mode)) {
+                prefix = 'SPACE';
+            } else if (last_type === 'TK_STRING') {
+                prefix = 'NEWLINE';
+            } else if (last_type === 'TK_WORD') {
+                prefix = 'SPACE';
+            } else if (last_type === 'TK_START_BLOCK') {
+                prefix = 'NEWLINE';
+            } else if (last_type === 'TK_END_EXPR') {
+                print_single_space();
+                prefix = 'NEWLINE';
+            }
+
+            if (last_type !== 'TK_END_BLOCK' && in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
+                print_newline();
+            } else if (in_array(token_text, line_starters) || prefix === 'NEWLINE') {
+                if (last_text === 'else') {
+                    // no need to force newline on else break
+                    print_single_space();
+                } else if ((last_type === 'TK_START_EXPR' || last_text === '=' || last_text === ',') && token_text === 'function') {
+                    // no need to force newline on 'function': (function
+                    // DONOTHING
+                } else if (last_text === 'return' || last_text === 'throw') {
+                    // no newline between 'return nnn'
+                    print_single_space();
+                } else if (last_type !== 'TK_END_EXPR') {
+                    if ((last_type !== 'TK_START_EXPR' || token_text !== 'var') && last_text !== ':') {
+                        // no need to force newline on 'var': for (var x = 0...)
+                        if (token_text === 'if' && last_word === 'else' && last_text !== '{') {
+                            // no newline for } else if {
+                            print_single_space();
+                        } else {
+                            print_newline();
+                        }
+                    }
+                } else {
+                    if (in_array(token_text, line_starters) && last_text !== ')') {
+                        print_newline();
+                    }
+                }
+            } else if (prefix === 'SPACE') {
+                print_single_space();
+            }
+            print_token();
+            last_word = token_text;
+
+            if (token_text === 'var') {
+                flags.var_line = true;
+                flags.var_line_tainted = false;
+            }
+
+            if (token_text === 'if' || token_text === 'else') {
+                flags.if_line = true;
+            }
+
+            break;
+
+        case 'TK_SEMICOLON':
+
+            print_token();
+            flags.var_line = false;
+            break;
+
+        case 'TK_STRING':
+
+            if (last_type === 'TK_START_BLOCK' || last_type === 'TK_END_BLOCK' || last_type === 'TK_SEMICOLON') {
+                print_newline();
+            } else if (last_type === 'TK_WORD') {
+                print_single_space();
+            }
+            print_token();
+            break;
+
+        case 'TK_OPERATOR':
+
+            var start_delim = true;
+            var end_delim = true;
+            if (flags.var_line && token_text === ',' && (is_expression(flags.mode))) {
+                // do not break on comma, for(var a = 1, b = 2)
+                flags.var_line_tainted = false;
+            }
+
+            if (flags.var_line) {
+                if (token_text === ',') {
+                    if (flags.var_line_tainted) {
+                        print_token();
+                        print_newline();
+                        output.push(indent_string);
+                        flags.var_line_tainted = false;
+                        break;
+                    } else {
+                        flags.var_line_tainted = false;
+                    }
+                } else {
+                    flags.var_line_tainted = true;
+                    if (token_text === ':') {
+                        flags.var_line = false;
+                    }
+                }
+            }
+
+            if (last_text === 'return' || last_text === 'throw') {
+                // "return" had a special handling in TK_WORD. Now we need to return the favor
+                print_single_space();
+                print_token();
+                break;
+            }
+
+            if (token_text === ':' && flags.in_case) {
+                print_token(); // colon really asks for separate treatment
+                print_newline();
+                flags.in_case = false;
+                break;
+            }
+
+            if (token_text === '::') {
+                // no spaces around exotic namespacing syntax operator
+                print_token();
+                break;
+            }
+
+            if (token_text === ',') {
+                if (flags.var_line) {
+                    if (flags.var_line_tainted) {
+                        print_token();
+                        print_newline();
+                        flags.var_line_tainted = false;
+                    } else {
+                        print_token();
+                        print_single_space();
+                    }
+                } else if (last_type === 'TK_END_BLOCK') {
+                    print_token();
+                    print_newline();
+                } else {
+                    if (flags.mode === 'BLOCK') {
+                        print_token();
+                        print_newline();
+                    } else {
+                        // EXPR or DO_BLOCK
+                        print_token();
+                        print_single_space();
+                    }
+                }
+                break;
+            } else if (token_text === '--' || token_text === '++') { // unary operators special case
+                if (last_text === ';') {
+                    if (flags.mode === 'BLOCK') {
+                        // { foo; --i }
+                        print_newline();
+                        start_delim = true;
+                        end_delim = false;
+                    } else {
+                        // space for (;; ++i)
+                        start_delim = true;
+                        end_delim = false;
+                    }
+                } else {
+                    if (last_text === '{') {
+                        // {--i
+                        print_newline();
+                    }
+                    start_delim = false;
+                    end_delim = false;
+                }
+            } else if ((token_text === '!' || token_text === '+' || token_text === '-') && (last_text === 'return' || last_text === 'case')) {
+                start_delim = true;
+                end_delim = false;
+            } else if ((token_text === '!' || token_text === '+' || token_text === '-') && last_type === 'TK_START_EXPR') {
+                // special case handling: if (!a)
+                start_delim = false;
+                end_delim = false;
+            } else if (last_type === 'TK_OPERATOR') {
+                start_delim = false;
+                end_delim = false;
+            } else if (last_type === 'TK_END_EXPR') {
+                start_delim = true;
+                end_delim = true;
+            } else if (token_text === '.') {
+                // decimal digits or object.property
+                start_delim = false;
+                end_delim = false;
+
+            } else if (token_text === ':') {
+                if (is_ternary_op()) {
+                    start_delim = true;
+                } else {
+                    start_delim = false;
+                }
+            }
+            if (start_delim) {
+                print_single_space();
+            }
+
+            print_token();
+
+            if (end_delim) {
+                print_single_space();
+            }
+            break;
+
+        case 'TK_BLOCK_COMMENT':
+
+            print_newline();
+            if (token_text.substring(0, 3) == '/**') {
+                print_javadoc_comment();
+            } else {
+                print_token();
+            }
+            print_newline();
+            break;
+
+        case 'TK_COMMENT':
+
+            // print_newline();
+            if (wanted_newline) {
+                print_newline();
+            } else {
+                print_single_space();
+            }
+            print_token();
+            print_newline();
+            break;
+
+        case 'TK_UNKNOWN':
+            print_token();
+            break;
+        }
+
+        last_last_text = last_text;
+        last_type = token_type;
+        last_text = token_text;
+    }
+
+    return output.join('').replace(/\n+$/, '');
+
+}
\ No newline at end of file
diff --git a/app/src/main/assets/numbers/0.png b/app/src/main/assets/numbers/0.png
new file mode 100644
index 00000000..782245b3
Binary files /dev/null and b/app/src/main/assets/numbers/0.png differ
diff --git a/app/src/main/assets/numbers/1.png b/app/src/main/assets/numbers/1.png
new file mode 100644
index 00000000..ea3d3542
Binary files /dev/null and b/app/src/main/assets/numbers/1.png differ
diff --git a/app/src/main/assets/numbers/2.png b/app/src/main/assets/numbers/2.png
new file mode 100644
index 00000000..8c343784
Binary files /dev/null and b/app/src/main/assets/numbers/2.png differ
diff --git a/app/src/main/assets/numbers/3.png b/app/src/main/assets/numbers/3.png
new file mode 100644
index 00000000..43b73e6b
Binary files /dev/null and b/app/src/main/assets/numbers/3.png differ
diff --git a/app/src/main/assets/numbers/4.png b/app/src/main/assets/numbers/4.png
new file mode 100644
index 00000000..c6a089ff
Binary files /dev/null and b/app/src/main/assets/numbers/4.png differ
diff --git a/app/src/main/assets/numbers/5.png b/app/src/main/assets/numbers/5.png
new file mode 100644
index 00000000..32d78e3b
Binary files /dev/null and b/app/src/main/assets/numbers/5.png differ
diff --git a/app/src/main/assets/numbers/6.png b/app/src/main/assets/numbers/6.png
new file mode 100644
index 00000000..d5a756a3
Binary files /dev/null and b/app/src/main/assets/numbers/6.png differ
diff --git a/app/src/main/assets/numbers/7.png b/app/src/main/assets/numbers/7.png
new file mode 100644
index 00000000..dc46da63
Binary files /dev/null and b/app/src/main/assets/numbers/7.png differ
diff --git a/app/src/main/assets/numbers/8.png b/app/src/main/assets/numbers/8.png
new file mode 100644
index 00000000..4e1d4e8b
Binary files /dev/null and b/app/src/main/assets/numbers/8.png differ
diff --git a/app/src/main/assets/numbers/9.png b/app/src/main/assets/numbers/9.png
new file mode 100644
index 00000000..a17fa212
Binary files /dev/null and b/app/src/main/assets/numbers/9.png differ
diff --git a/app/src/main/assets/sample/Shell命令/小米6666脚本.js b/app/src/main/assets/sample/Shell命令/小米6666脚本.js
new file mode 100644
index 00000000..9327b560
--- /dev/null
+++ b/app/src/main/assets/sample/Shell命令/小米6666脚本.js
@@ -0,0 +1,29 @@
+importClass(com.stardust.mi666.Cracker);
+var cracker = new Cracker();
+const path = "/sdcard/666.png";
+var count = 1;
+sleep(2000);
+while(notStopped()){
+  Screencap(path);
+  sleep(2000);
+  toast("你已经被耍了" + count + "次");
+  var coords = cracker.crack(path);
+  for each(var coord in coords){
+    Tap(coord[0], coord[1]);
+  }
+  sleep(9000);
+  关闭();
+  sleep(2000);
+  console.log(++count);
+  再玩一次();
+  sleep(10000);
+}
+
+
+function 关闭(){
+  Tap(933, 660);
+}
+  
+function 再玩一次(){
+  Tap(521, 1615);
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stardust/mi666/Cracker.java b/app/src/main/java/com/stardust/mi666/Cracker.java
new file mode 100644
index 00000000..e2dc1f90
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/Cracker.java
@@ -0,0 +1,68 @@
+package com.stardust.mi666;
+
+import com.stardust.util.ScreenMetrics;
+
+import java.util.List;
+
+/**
+ * Created by Stardust on 2017/4/24.
+ */
+
+public class Cracker {
+
+    private OCR mOCR;
+    private Solver mSolver;
+    private int mX, mY, mIntervalX, mIntervalY, mWidth, mHeight;
+
+    private void init(int x, int y, int intervalX, int intervalY, int w, int h) {
+        mOCR = new OCR(x, y, intervalX, intervalY, w, h);
+        mSolver = new Solver();
+        mX = x;
+        mY = y;
+        mIntervalY = intervalY;
+        mIntervalX = intervalX;
+        mWidth = w;
+        mHeight = h;
+    }
+
+    public Cracker() {
+        if (ScreenMetrics.getScreenWidth() == 1080 && ScreenMetrics.getScreenHeight() == 1920) {
+            init(68, 724, 238, 236, 228, 68);
+        } else {
+            double scaleX = 1080 / ScreenMetrics.getScreenWidth();
+            double scaleY = 1920 / ScreenMetrics.getScreenHeight();
+            init((int) (68 * scaleX), (int) (724 * scaleY), (int) (238 * scaleX), (int) (236 * scaleY), (int) (228 * scaleX), (int) (68 * scaleY));
+        }
+    }
+
+    public int[][] crack(String path) {
+        List<Integer> numbers = mOCR.detect(path);
+        mSolver.solve(numbers);
+        if (!mSolver.isSolved()) {
+            return new int[0][];
+        }
+        List<Integer> result = mSolver.getResult();
+        boolean[] used = new boolean[numbers.size()];
+        int[][] coordinates = new int[result.size()][2];
+        for (int i = 0; i < coordinates.length; i++) {
+            int index = indexOf(numbers, used, result.get(i));
+            int row = index / 4;
+            int col = index % 4;
+            int x = mX + mIntervalX * col + mWidth / 2;
+            int y = mY + mIntervalY * row + mHeight / 2;
+            coordinates[i][0] = x;
+            coordinates[i][1] = y;
+        }
+        return coordinates;
+    }
+
+    private int indexOf(List<Integer> numbers, boolean[] used, int integer) {
+        for (int i = 0; i < numbers.size(); i++) {
+            if (numbers.get(i) == integer && !used[i]) {
+                used[i] = true;
+                return i;
+            }
+        }
+        return -1;
+    }
+}
diff --git a/app/src/main/java/com/stardust/mi666/OCR.java b/app/src/main/java/com/stardust/mi666/OCR.java
new file mode 100644
index 00000000..3d29edc7
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/OCR.java
@@ -0,0 +1,81 @@
+package com.stardust.mi666;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+import com.stardust.mi666.ocr.ColorDetector;
+import com.stardust.mi666.ocr.SimpleTextSplitter;
+import com.stardust.mi666.ocr.TemplateMatching;
+import com.stardust.pio.UncheckedIOException;
+import com.stardust.util.ViewUtil;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Stardust on 2017/4/24.
+ */
+
+public class OCR {
+
+    private static com.stardust.mi666.ocr.OCR ocr;
+    private static SimpleTextSplitter textSplitter;
+
+    static {
+        ColorDetector colorDetector = new ColorDetector.SimpleColorDetector(0xff9f826f);
+        ocr = new TemplateMatching.TemplateMatchingOCR(1, colorDetector);
+        textSplitter = new SimpleTextSplitter(colorDetector);
+    }
+
+    private int mX, mY, mIntervalX, mIntervalY, mWidth, mHeight;
+
+    public OCR(int x, int y, int intervalX, int intervalY, int w, int h) {
+        mX = x;
+        mY = y;
+        mIntervalY = intervalY;
+        mIntervalX = intervalX;
+        mWidth = w;
+        mHeight = h;
+    }
+
+    public static void init(Context context) {
+        try {
+            for (int i = 0; i < 10; i++) {
+                Bitmap number = BitmapFactory.decodeStream(context.getAssets().open("numbers/" + i + ".png"));
+                ocr.addChar((char) ('0' + i), number);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public List<Integer> detect(String path) {
+        Bitmap screenshot = BitmapFactory.decodeFile(path);
+        try {
+            List<Integer> numbers = new ArrayList<>(16);
+            for (int i = 0; i < 4; i++) {
+                for (int j = 0; j < 4; j++) {
+                    Bitmap block = getBlockAt(screenshot, i, j);
+                    List<Bitmap> bitmaps = textSplitter.split(block);
+                    StringBuilder sb = new StringBuilder();
+                    for (Bitmap num : bitmaps) {
+                        sb.append(ocr.detect(num));
+                    }
+                    numbers.add(Integer.parseInt(sb.toString()));
+                    Log.i("TestOCR", "result = " + sb);
+                }
+            }
+            return numbers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private Bitmap getBlockAt(Bitmap bitmap, int row, int col) {
+        return Bitmap.createBitmap(bitmap, mX + col * mIntervalX, mY + row * mIntervalY, mWidth, mHeight);
+    }
+}
diff --git a/app/src/main/java/com/stardust/mi666/Solver.java b/app/src/main/java/com/stardust/mi666/Solver.java
new file mode 100644
index 00000000..58897f29
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/Solver.java
@@ -0,0 +1,55 @@
+package com.stardust.mi666;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Stardust on 2017/4/24.
+ */
+
+public class Solver {
+
+    private boolean mSolved = false;
+    private List<Integer> mResult = new ArrayList<>();
+    private List<Integer> mTmpList = new ArrayList<>();
+    private int[] value;
+
+
+    void solve(int sum, int index) {
+        if (mSolved || index < 0) return;
+        if (sum == value[index] && mTmpList.size() == 5) {
+            mSolved = true;
+            mTmpList.add(value[index]);
+            mResult.addAll(mTmpList);
+            return;
+        }
+        mTmpList.add(value[index]);
+        solve(sum - value[index], index - 1);
+        mTmpList.remove(mTmpList.size() - 1);
+        solve(sum, index - 1);
+    }
+
+    public void solve(int[] num) {
+        mResult.clear();
+        mTmpList.clear();
+        mSolved = false;
+        value = num;
+        solve(6666, 15);
+    }
+
+    public boolean isSolved() {
+        return mSolved;
+    }
+
+    public List<Integer> getResult() {
+        return mResult;
+    }
+
+    public void solve(List<Integer> numbers) {
+        int[] num = new int[numbers.size()];
+        for (int i = 0; i < num.length; i++) {
+            num[i] = numbers.get(i);
+        }
+        solve(num);
+    }
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/ColorDetector.java b/app/src/main/java/com/stardust/mi666/ocr/ColorDetector.java
new file mode 100644
index 00000000..9472b374
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/ColorDetector.java
@@ -0,0 +1,53 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Color;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+public interface ColorDetector {
+
+    boolean isCharPixel(int color);
+
+    class ColorDistanceDetector implements ColorDetector {
+
+        private int mColor;
+        private double mThreshold;
+
+        public ColorDistanceDetector(int color, double threshold) {
+            mColor = color;
+            mThreshold = threshold;
+        }
+
+        public static double distance(int c1, int c2) {
+            double meanR = (Color.red(c1) + Color.red(c2)) / 2;
+            int r = Color.red(c1) - Color.red(c2);
+            int g = Color.green(c1) - Color.green(c2);
+            int b = Color.blue(c1) - Color.blue(c2);
+            double weightR = 2 + meanR / 256;
+            double weightG = 4.0;
+            double weightB = 2 + (255 - meanR) / 256;
+            return Math.sqrt(weightR * r * r + weightG * g * g + weightB * b * b);
+        }
+
+        @Override
+        public boolean isCharPixel(int color) {
+            return distance(color, mColor) < mThreshold;
+        }
+    }
+
+    class SimpleColorDetector implements ColorDetector {
+
+        private int mColor;
+
+        public SimpleColorDetector(int color) {
+            mColor = color;
+        }
+
+        @Override
+        public boolean isCharPixel(int color) {
+            return mColor == color;
+        }
+    }
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/OCR.java b/app/src/main/java/com/stardust/mi666/ocr/OCR.java
new file mode 100644
index 00000000..81757171
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/OCR.java
@@ -0,0 +1,15 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Bitmap;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+public interface OCR {
+
+    void addChar(char ch, Bitmap bitmap);
+
+    char detect(Bitmap bitmap);
+
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/SimpleOCR.java b/app/src/main/java/com/stardust/mi666/ocr/SimpleOCR.java
new file mode 100644
index 00000000..8f6e8cf9
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/SimpleOCR.java
@@ -0,0 +1,142 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+public class SimpleOCR implements OCR {
+
+    private static class PixelLine {
+        int start;
+        int end;
+
+        PixelLine(int start, int end) {
+            this.start = start;
+            this.end = end;
+        }
+    }
+
+    private static class PixelLines {
+        int start = -1;
+        List<PixelLine> lines = new ArrayList<>();
+
+
+        void addLine(PixelLine line) {
+            lines.add(line);
+            if (start == -1 || start > line.start) {
+                start = line.start;
+            }
+        }
+
+        int distanceTo(PixelLines another) {
+            if (lines.size() != another.lines.size()) {
+                return lineWidthSum() + another.lineWidthSum();
+            }
+            int offset = another.start - start;
+            int sum = 0;
+            for (int i = 0; i < lines.size(); i++) {
+                sum += Math.abs(lines.get(i).start + offset - another.lines.get(i).start);
+                sum += Math.abs(lines.get(i).end + offset - another.lines.get(i).end);
+            }
+            return sum;
+        }
+
+        private int lineWidthSum() {
+            int sum = 0;
+            for (PixelLine line : lines) {
+                sum += line.end - line.start;
+            }
+            return sum;
+        }
+    }
+
+
+    public static class CharFeature {
+
+        private List<PixelLines> mPixelLinesPerRow;
+
+        public CharFeature(int rowNumber) {
+            mPixelLinesPerRow = new ArrayList<>(rowNumber);
+            for (int i = 0; i < rowNumber; i++) {
+                mPixelLinesPerRow.add(new PixelLines());
+            }
+        }
+
+        void addLine(int row, PixelLine line) {
+            mPixelLinesPerRow.get(row).addLine(line);
+        }
+
+        int distanceTo(CharFeature feature) {
+            int sum = 0;
+            if (feature.mPixelLinesPerRow.size() != mPixelLinesPerRow.size()) {
+                for (PixelLines lines : mPixelLinesPerRow) {
+                    sum += lines.lines.size();
+                }
+                return sum;
+            }
+            for (int i = 0; i < mPixelLinesPerRow.size(); i++) {
+                sum += mPixelLinesPerRow.get(i).distanceTo(feature.mPixelLinesPerRow.get(i));
+            }
+            return sum;
+        }
+
+    }
+
+    private static final String TAG = "SimpleOCR";
+    private Map<Character, CharFeature> mChars = new HashMap<>();
+    private ColorDetector mColorDetector;
+
+    public SimpleOCR(ColorDetector colorDetector) {
+        mColorDetector = colorDetector;
+    }
+
+    public void addChar(char c, Bitmap ch) {
+        mChars.put(c, getCharFeature(ch));
+    }
+
+    public CharFeature getCharFeature(Bitmap bitmap) {
+        CharFeature feature = new CharFeature(bitmap.getHeight());
+        for (int y = 0; y < bitmap.getHeight(); y++) {
+            int mPixelStart = -1;
+            for (int x = 0; x < bitmap.getWidth(); x++) {
+                if (mColorDetector.isCharPixel(bitmap.getPixel(x, y))) {
+                    if (mPixelStart == -1) {
+                        mPixelStart = x;
+                    }
+                } else if (mPixelStart >= 0) {
+                    feature.addLine(y, new PixelLine(mPixelStart, x));
+                    mPixelStart = -1;
+                }
+            }
+            if (mPixelStart >= 0) {
+                feature.addLine(y, new PixelLine(mPixelStart, bitmap.getWidth()));
+            }
+        }
+        return feature;
+    }
+
+    public char detect(Bitmap bitmap) {
+        CharFeature feature = getCharFeature(bitmap);
+        int min = Integer.MAX_VALUE;
+        char detectedChar = ' ';
+        for (Map.Entry<Character, CharFeature> ch : mChars.entrySet()) {
+            int distance = ch.getValue().distanceTo(feature);
+            Log.d(TAG, "ch=" + ch.getKey() + " distance=" + distance);
+            if (distance < min) {
+                min = distance;
+                detectedChar = ch.getKey();
+            }
+        }
+        return detectedChar;
+    }
+
+
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/SimpleTextDetector.java b/app/src/main/java/com/stardust/mi666/ocr/SimpleTextDetector.java
new file mode 100644
index 00000000..05641ddd
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/SimpleTextDetector.java
@@ -0,0 +1,34 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Bitmap;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+public class SimpleTextDetector {
+
+    private ColorDetector mColorDetector;
+
+    public SimpleTextDetector(ColorDetector colorDetector) {
+        mColorDetector = colorDetector;
+    }
+
+    public Bitmap detect(Bitmap bitmap) {
+        int minX = bitmap.getWidth();
+        int minY = bitmap.getHeight();
+        int maxX = 0;
+        int maxY = 0;
+        for (int i = 0; i < bitmap.getWidth(); i++) {
+            for (int j = 0; j < bitmap.getHeight(); j++) {
+                if (mColorDetector.isCharPixel(bitmap.getPixel(i, j))) {
+                    minX = Math.min(minX, i);
+                    minY = Math.min(minY, j);
+                    maxX = Math.max(maxX, i);
+                    maxY = Math.max(maxY, j);
+                }
+            }
+        }
+        return Bitmap.createBitmap(bitmap, minX, minY, maxX - minX, maxY - minY);
+    }
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/SimpleTextSplitter.java b/app/src/main/java/com/stardust/mi666/ocr/SimpleTextSplitter.java
new file mode 100644
index 00000000..54258087
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/SimpleTextSplitter.java
@@ -0,0 +1,52 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Bitmap;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Stardust on 2017/4/24.
+ */
+
+public class SimpleTextSplitter {
+
+    private ColorDetector mColorDetector;
+    private SimpleTextDetector mSimpleTextDetector;
+
+    public SimpleTextSplitter(ColorDetector colorDetector) {
+        mColorDetector = colorDetector;
+        mSimpleTextDetector = new SimpleTextDetector(colorDetector);
+    }
+
+    public List<Bitmap> split(Bitmap bitmap) {
+        Bitmap text = mSimpleTextDetector.detect(bitmap);
+        int[] projection = new int[text.getWidth()];
+        for (int i = 0; i < text.getWidth(); i++) {
+            for (int j = 0; j < text.getHeight(); j++) {
+                if (mColorDetector.isCharPixel(text.getPixel(i, j))) {
+                    projection[i]++;
+                }
+            }
+        }
+        int start = -1;
+        List<Bitmap> numbers = new ArrayList<>();
+        for (int i = 0; i < text.getWidth(); i++) {
+            if (projection[i] > 0) {
+                if (start == -1) {
+                    start = i;
+                }
+            } else {
+                if (start >= 0) {
+                    numbers.add(Bitmap.createBitmap(text, start, 0, i - start, text.getHeight()));
+                    start = -1;
+                }
+            }
+        }
+        if (start >= 0) {
+            numbers.add(Bitmap.createBitmap(text, start, 0, text.getWidth() - start, text.getHeight()));
+        }
+        return numbers;
+    }
+
+}
diff --git a/app/src/main/java/com/stardust/mi666/ocr/TemplateMatching.java b/app/src/main/java/com/stardust/mi666/ocr/TemplateMatching.java
new file mode 100644
index 00000000..97f7c7ee
--- /dev/null
+++ b/app/src/main/java/com/stardust/mi666/ocr/TemplateMatching.java
@@ -0,0 +1,109 @@
+package com.stardust.mi666.ocr;
+
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import com.stardust.scriptdroid.tool.BitmapTool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+public class TemplateMatching {
+
+    private static final String LOG_TAG = "TemplateMatching";
+
+    private int mBlockSize;
+    private ColorDetector mColorDetector;
+
+
+    public TemplateMatching(int blockSize, ColorDetector colorDetector) {
+        mBlockSize = blockSize;
+        mColorDetector = colorDetector;
+    }
+
+    public int[][] getFeature(Bitmap bitmap) {
+        int w = bitmap.getWidth() / mBlockSize;
+        int h = bitmap.getHeight() / mBlockSize;
+        int[][] mat = new int[w][h];
+        for (int i = 0; i < bitmap.getWidth(); i++) {
+            for (int j = 0; j < bitmap.getHeight(); j++) {
+                if (mColorDetector.isCharPixel(bitmap.getPixel(i, j))) {
+                    mat[i * w / bitmap.getWidth()][j * h / bitmap.getHeight()]++;
+                }
+            }
+        }
+        return mat;
+    }
+
+    public int distance(int[][] f, int[][] template, int offsetX, int offsetY) {
+        int sum = 0;
+        for (int i = 0; i < template.length; i++) {
+            for (int j = 0; j < template[i].length; j++) {
+                if (i >= f.length || j >= f[i].length) {
+                    sum += template[i].length - j;
+                    break;
+                }
+                sum += Math.abs(template[i][j] - f[i + offsetX][j + offsetY]);
+
+            }
+        }
+        return sum;
+    }
+
+    public int minDistance(int[][] f, int[][] template) {
+        int min = Integer.MAX_VALUE;
+        int i = 0;
+        while (i < template.length && i + template.length - 1 < f.length) {
+            int j = 0;
+            while (j < template[i].length && j + template[i].length - 1 < f[i].length) {
+                int d = distance(f, template, i, j);
+                if (d < min) {
+                    min = d;
+                }
+                j++;
+            }
+            i++;
+        }
+        return min;
+    }
+
+    public static class TemplateMatchingOCR implements OCR {
+
+        private Map<Character, int[][]> mChars = new HashMap<>();
+        private TemplateMatching mTemplateMatching;
+        private SimpleTextDetector mSimpleTextDetector;
+
+        public TemplateMatchingOCR(int blockSize, ColorDetector colorDetector) {
+            mTemplateMatching = new TemplateMatching(blockSize, colorDetector);
+            mSimpleTextDetector = new SimpleTextDetector(colorDetector);
+        }
+
+        @Override
+        public void addChar(char ch, Bitmap bitmap) {
+            mChars.put(ch, mTemplateMatching.getFeature(mSimpleTextDetector.detect(bitmap)));
+        }
+
+        @Override
+        public char detect(Bitmap bitmap) {
+            int min = Integer.MAX_VALUE;
+            char ch = ' ';
+            for (Map.Entry<Character, int[][]> entry : mChars.entrySet()) {
+                int[][] f = mTemplateMatching.getFeature(BitmapTool.scaleBitmap(bitmap, entry.getValue().length, entry.getValue()[0].length));
+                int d = mTemplateMatching.distance(f, entry.getValue(), 0, 0);
+                Log.d(LOG_TAG, "char: " + entry.getKey() + " distance: " + d);
+                if (d < min) {
+                    if (entry.getKey() == '1' && d > 30) {
+                        continue;
+                    }
+                    min = d;
+                    ch = entry.getKey();
+                }
+            }
+            return ch;
+        }
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/App.java b/app/src/main/java/com/stardust/scriptdroid/App.java
index b11a9e50..d6b43dcb 100644
--- a/app/src/main/java/com/stardust/scriptdroid/App.java
+++ b/app/src/main/java/com/stardust/scriptdroid/App.java
@@ -10,13 +10,17 @@ import android.support.annotation.Keep;
 import com.squareup.leakcanary.LeakCanary;
 import com.stardust.app.SimpleActivityLifecycleCallbacks;
 import com.stardust.app.VolumeChangeObserver;
+import com.stardust.mi666.OCR;
 import com.stardust.scriptdroid.autojs.AutoJs;
 import com.stardust.scriptdroid.service.AccessibilityWatchDogService;
 import com.stardust.scriptdroid.tool.CrashHandler;
-import com.stardust.scriptdroid.tool.UpdateChecker;
+import com.stardust.scriptdroid.tool.JsBeautifierFactory;
 import com.stardust.scriptdroid.ui.error.ErrorReportActivity;
 import com.stardust.theme.ThemeColor;
 import com.stardust.theme.ThemeColorManager;
+import com.stardust.util.ScreenMetrics;
+
+import java.lang.ref.WeakReference;
 
 /**
  * Created by Stardust on 2017/1/27.
@@ -26,23 +30,25 @@ public class App extends Application {
 
     private static final String TAG = "App";
 
-    private static App instance;
-    private static Activity currentActivity;
+    private static WeakReference<App> instance;
+    private static WeakReference<Activity> currentActivity;
 
     public static App getApp() {
-        return instance;
+        return instance.get();
     }
 
     private VolumeChangeObserver mVolumeChangeObserver = new VolumeChangeObserver();
 
     public void onCreate() {
         super.onCreate();
-        instance = this;
+        instance = new WeakReference<>(this);
         setUpDebugEnvironment();
         init();
         registerActivityLifecycleCallback();
+
     }
 
+
     private void setUpDebugEnvironment() {
         if (LeakCanary.isInAnalyzerProcess(this)) {
             return;
@@ -56,8 +62,10 @@ public class App extends Application {
         ThemeColorManager.setDefaultThemeColor(new ThemeColor(getResources().getColor(R.color.colorPrimary), getResources().getColor(R.color.colorPrimaryDark), getResources().getColor(R.color.colorAccent)));
         ThemeColorManager.init(this);
         AutoJs.initInstance(this);
+        JsBeautifierFactory.initJsBeautify(this, "js/jsbeautify.js");
         initVolumeChangeObserver();
         startService(new Intent(this, AccessibilityWatchDogService.class));
+        OCR.init(this);
     }
 
     private void initVolumeChangeObserver() {
@@ -74,10 +82,6 @@ public class App extends Application {
 
     private void registerActivityLifecycleCallback() {
         registerActivityLifecycleCallbacks(new SimpleActivityLifecycleCallbacks() {
-            @Override
-            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-                currentActivity = activity;
-            }
 
             @Override
             public void onActivityPaused(Activity activity) {
@@ -86,20 +90,17 @@ public class App extends Application {
 
             @Override
             public void onActivityResumed(Activity activity) {
-                currentActivity = activity;
+                ScreenMetrics.initIfNeeded(activity);
+                currentActivity = new WeakReference<>(activity);
             }
 
-            @Override
-            public void onActivityStopped(Activity activity) {
-                currentActivity = null;
-            }
 
         });
     }
 
     @Keep
     public static Activity currentActivity() {
-        return currentActivity;
+        return currentActivity.get();
     }
 
     public static String getResString(int id) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/Pref.java b/app/src/main/java/com/stardust/scriptdroid/Pref.java
index 5cd8f2df..f443edb6 100644
--- a/app/src/main/java/com/stardust/scriptdroid/Pref.java
+++ b/app/src/main/java/com/stardust/scriptdroid/Pref.java
@@ -46,7 +46,7 @@ public class Pref {
     }
 
     public static boolean isFirstGoToAccessibilitySetting() {
-        return getDisposableBoolean("isFirstGoToAccessibilitySetting", true);
+        return getDisposableBoolean("I miss you so much ...", true);
     }
 
     public static int oldVersion() {
@@ -77,7 +77,7 @@ public class Pref {
         return App.getResString(id);
     }
 
-    public static int MaxTextLengthForCodeCompletion() {
+    public static int getMaxTextLengthForCodeCompletion() {
         try {
             return Integer.parseInt(def().getString(App.getApp().getString(R.string.key_max_length_for_code_completion), "2000"));
         } catch (NumberFormatException e) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/ConsoleFloaty.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/ConsoleFloaty.java
new file mode 100644
index 00000000..efc88cd0
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/ConsoleFloaty.java
@@ -0,0 +1,77 @@
+package com.stardust.scriptdroid.external.floating_window;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+
+import com.stardust.enhancedfloaty.ResizableFloaty;
+import com.stardust.enhancedfloaty.ResizableFloatyService;
+
+import com.stardust.scriptdroid.R;
+/**
+ * Created by Stardust on 2017/4/20.
+ */
+
+public class ConsoleFloaty extends ResizableFloaty {
+
+    private ContextWrapper mContextWrapper;
+    private View mResizer, mMoveCursor;
+
+    @Override
+    public View inflateCollapsedView(ResizableFloatyService service) {
+        ensureContextWrapper(service);
+        return View.inflate(mContextWrapper, R.layout.floating_window_collapse, null);
+    }
+
+    private void ensureContextWrapper(Context context) {
+        if (mContextWrapper == null) {
+            mContextWrapper = new ContextThemeWrapper(context, R.style.AppTheme);
+        }
+    }
+
+    @Override
+    public View inflateExpandedView(ResizableFloatyService service) {
+        ensureContextWrapper(service);
+        View view = View.inflate(mContextWrapper, R.layout.floating_console_expand, null);
+        setListeners(view, service);
+        return view;
+    }
+
+    private void setListeners(final View view, final ResizableFloatyService service) {
+        view.findViewById(R.id.close).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                service.stopSelf();
+                service.stopForeground(true);
+            }
+        });
+        view.findViewById(R.id.move_or_resize).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(mMoveCursor.getVisibility() == View.VISIBLE){
+                    mMoveCursor.setVisibility(View.GONE);
+                    mResizer.setVisibility(View.GONE);
+                }else {
+                    mMoveCursor.setVisibility(View.VISIBLE);
+                    mResizer.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+    }
+
+    @Nullable
+    @Override
+    public View getResizerView(View expandedView) {
+        mResizer = expandedView.findViewById(R.id.resizer);
+        return mResizer;
+    }
+
+    @Nullable
+    @Override
+    public View getMoveCursorView(View expandedView) {
+        mMoveCursor = expandedView.findViewById(R.id.move_cursor);
+        return mMoveCursor;
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/FloatingConsole.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/FloatingConsole.java
new file mode 100644
index 00000000..32832c84
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/FloatingConsole.java
@@ -0,0 +1,16 @@
+package com.stardust.scriptdroid.external.floating_window;
+
+import android.content.Context;
+
+import com.stardust.enhancedfloaty.ResizableFloatyService;
+
+/**
+ * Created by Stardust on 2017/4/18.
+ */
+
+public class FloatingConsole {
+
+    public static void startFloatingService(Context context) {
+        ResizableFloatyService.startService(context, new ConsoleFloaty());
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/RecordNavigatorContent.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/RecordNavigatorContent.java
index b1009b36..1ca65178 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/RecordNavigatorContent.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/RecordNavigatorContent.java
@@ -186,7 +186,7 @@ public class RecordNavigatorContent implements NavigatorContent, Recorder.OnStat
 
     @Override
     public void onStop() {
-        MainActivity.onActionRecordStopped(mContext, mRecorder.getCode());
+        MainActivity.onRecordStop(mContext, mRecorder.getCode());
         mRecorder = null;
     }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/ScriptListNavigatorContent.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/ScriptListNavigatorContent.java
index 9a7fc773..5f7032a6 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/ScriptListNavigatorContent.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/content/ScriptListNavigatorContent.java
@@ -96,6 +96,7 @@ public class ScriptListNavigatorContent implements NavigatorContent {
                     int position = mFloatingScriptFileListView.getChildViewHolder((View) v.getParent()).getAdapterPosition();
                     ScriptFile file = mFloatingScriptFileListView.getAdapter().getScriptFileAt(position);
                     EditActivity.editFile(v.getContext(), file);
+                    HoverMenuService.postEvent(new MessageEvent(HoverMenuService.MESSAGE_COLLAPSE_MENU));
                 }
             });
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingLayoutHierarchyView.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingLayoutHierarchyView.java
index 9b6fe66d..b6f241c3 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingLayoutHierarchyView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingLayoutHierarchyView.java
@@ -62,14 +62,15 @@ public class FloatingLayoutHierarchyView extends LayoutHierarchyView {
                     .customView(mNodeInfoView, false)
                     .theme(Theme.LIGHT)
                     .build();
-            mNodeInfoDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+            if (mNodeInfoDialog.getWindow() != null)
+                mNodeInfoDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
         }
     }
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
-            EventBus.getDefault().post(new MessageEvent(HoverMenuService.MESSAGE_SHOW_AND_EXPAND_MENU));
+            HoverMenuService.postEvent(new MessageEvent(HoverMenuService.MESSAGE_SHOW_AND_EXPAND_MENU));
             setVisibility(GONE);
             return true;
         }
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/BitmapTool.java b/app/src/main/java/com/stardust/scriptdroid/tool/BitmapTool.java
new file mode 100644
index 00000000..2df02e28
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/BitmapTool.java
@@ -0,0 +1,71 @@
+package com.stardust.scriptdroid.tool;
+
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+
+/**
+ * Created by Stardust on 2017/4/22.
+ */
+
+public class BitmapTool {
+
+    public static Bitmap scaleBitmap(Bitmap origin, int newWidth, int newHeight) {
+        if (origin == null) {
+            return null;
+        }
+        int height = origin.getHeight();
+        int width = origin.getWidth();
+        float scaleWidth = ((float) newWidth) / width;
+        float scaleHeight = ((float) newHeight) / height;
+        Matrix matrix = new Matrix();
+        matrix.postScale(scaleWidth, scaleHeight);// 使用后乘
+        return Bitmap.createBitmap(origin, 0, 0, width, height, matrix, false);
+    }
+
+    /*
+
+    public static MatOfDMatch matchesBitmaps(Bitmap bitmap1, Bitmap bitmap2) {
+        FeatureDetector detector = FeatureDetector.create(FeatureDetector.BRISK);
+        DescriptorExtractor descriptor = DescriptorExtractor.create(DescriptorExtractor.ORB);
+        DescriptorMatcher matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMING);
+        Mat descriptors1 = computeDescriptors(bitmap1, detector, descriptor);
+        Mat descriptors2 = computeDescriptors(bitmap2, detector, descriptor);
+        MatOfDMatch matches = new MatOfDMatch();
+        matcher.match(descriptors1, descriptors2, matches);
+        return matches;
+    }
+
+    private static Mat computeDescriptors(Bitmap bitmap, FeatureDetector detector, DescriptorExtractor descriptor) {
+        Mat mat = bitmapToMat(bitmap.copy(bitmap.getConfig(), true));
+        Mat descriptors = new Mat();
+        MatOfKeyPoint keyPoints1 = new MatOfKeyPoint();
+        detector.detect(mat, keyPoints1);
+        descriptor.compute(mat, keyPoints1, descriptors);
+        return descriptors;
+    }
+
+    private static Mat bitmapToMat(Bitmap bmp) {
+        Mat mat = new Mat(bmp.getWidth(), bmp.getHeight(), CvType.CV_8UC1);
+        Utils.bitmapToMat(bmp, mat);
+        return mat;
+    }
+
+    public static Core.MinMaxLocResult templateMatching(Bitmap bitmap, Bitmap tmp, int matchMethod) {
+        Mat img = bitmapToMat(bitmap);
+        Mat template = bitmapToMat(tmp);
+
+        // / Create the result matrix
+        int result_cols = img.cols() - template.cols() + 1;
+        int result_rows = img.rows() - template.rows() + 1;
+        Mat result = new Mat(result_rows, result_cols, CvType.CV_32FC1);
+
+        // / Do the Matching and Normalize
+        Imgproc.matchTemplate(img, template, result, matchMethod);
+        Core.normalize(result, result, 0, 1, Core.NORM_MINMAX, -1, new Mat());
+
+        // / Localizing the best match with minMaxLoc
+        Core.MinMaxLocResult mmr = Core.minMaxLoc(result);
+        return mmr;
+    }
+    */
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/DrawableSaver.java b/app/src/main/java/com/stardust/scriptdroid/tool/DrawableSaver.java
index 54f69067..ff19010e 100644
--- a/app/src/main/java/com/stardust/scriptdroid/tool/DrawableSaver.java
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/DrawableSaver.java
@@ -14,7 +14,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.concurrent.Callable;
 
 /**
  * Created by Stardust on 2017/4/3.
@@ -24,14 +23,14 @@ public abstract class DrawableSaver {
 
     private static final String PREFIX = "saved_drawable_";
 
-    protected Drawable mOriginalDrawble;
+    protected Drawable mOriginalDrawable;
     private Context mContext;
     private String mName;
 
-    public DrawableSaver(Context context, String name, Drawable originalDrawble) {
+    public DrawableSaver(Context context, String name, Drawable originalDrawable) {
         mContext = context;
         mName = PREFIX + name;
-        mOriginalDrawble = originalDrawble;
+        mOriginalDrawable = originalDrawable;
         readImageAndApply();
     }
 
@@ -89,7 +88,7 @@ public abstract class DrawableSaver {
     }
 
     public void reset() {
-        applyDrawableToView(mOriginalDrawble);
+        applyDrawableToView(mOriginalDrawable);
         mContext.deleteFile(mName);
     }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/ImagePHash.java b/app/src/main/java/com/stardust/scriptdroid/tool/ImagePHash.java
new file mode 100644
index 00000000..e0781249
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/ImagePHash.java
@@ -0,0 +1,162 @@
+package com.stardust.scriptdroid.tool;
+
+/**
+ * Created by Stardust on 2017/4/23.
+ */
+
+import android.graphics.Bitmap;
+
+import com.stardust.mi666.ocr.ColorDetector;
+import com.stardust.mi666.ocr.SimpleTextDetector;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ImagePHash {
+
+    private static final String LOG_TAG = "ImagePHash";
+
+    private int width = 32;
+    private int height;
+    private int smallerWidth = 8;
+    private int smallerHeight;
+
+    public ImagePHash() {
+        this(32, 8);
+    }
+
+    public ImagePHash(int width, int smallerWidth) {
+        this(width, width, smallerWidth, smallerWidth);
+    }
+
+    public ImagePHash(int width, int height, int smallerWidth, int smallerHeight) {
+        this.width = width;
+        this.height = height;
+        this.smallerWidth = smallerWidth;
+        this.smallerHeight = smallerHeight;
+        initCoefficients();
+    }
+
+    public int distance(boolean[] s1, boolean[] s2) {
+        int counter = 0;
+        for (int k = 0; k < s1.length; k++) {
+            if (s1[k] != s2[k]) {
+                counter++;
+            }
+        }
+        return counter;
+    }
+
+
+    public boolean[] getHash(Bitmap img) {
+        double[][] vals = new double[width][height];
+        img = BitmapTool.scaleBitmap(img, width, height);
+
+        for (int x = 0; x < img.getWidth(); x++) {
+            for (int y = 0; y < img.getHeight(); y++) {
+                vals[x][y] = getBlue(img, x, y);
+            }
+        }
+
+        double[][] dctVals = applyDCT(vals);
+
+        double total = 0;
+
+        for (int x = 0; x < smallerWidth; x++) {
+            for (int y = 0; y < smallerHeight; y++) {
+                total += dctVals[x][y];
+            }
+        }
+        total -= dctVals[0][0];
+
+        double avg = total / (double) ((smallerWidth * smallerHeight) - 1);
+        boolean[] hash = new boolean[smallerWidth * smallerHeight];
+        int i = 0;
+        for (int x = 0; x < smallerWidth; x++) {
+            for (int y = 0; y < smallerHeight; y++) {
+                if (x != 0 && y != 0) {
+                    hash[i++] = dctVals[x][y] > avg;
+                }
+            }
+        }
+        return hash;
+    }
+
+
+    private static int getBlue(Bitmap img, int x, int y) {
+        return img.getPixel(x, y) & 0xff;
+    }
+
+    private double[] c;
+    private double[] c2;
+
+    private void initCoefficients() {
+        c = new double[width];
+        c2 = new double[height];
+        for (int i = 1; i < width; i++) {
+            c[i] = 1;
+        }
+        for (int i = 1; i < height; i++) {
+            c2[i] = 1;
+        }
+        c[0] = 1 / Math.sqrt(2.0);
+        c2[0] = 1 / Math.sqrt(2.0);
+    }
+
+    private double[][] applyDCT(double[][] f) {
+        double[][] F = new double[width][height];
+        for (int u = 0; u < width; u++) {
+            for (int v = 0; v < height; v++) {
+                double sum = 0.0;
+                for (int i = 0; i < width; i++) {
+                    for (int j = 0; j < height; j++) {
+                        sum += Math.cos(((2 * i + 1) / (2.0 * width)) * u * Math.PI) * Math.cos(((2 * j + 1) / (2.0 * height)) * v * Math.PI) * (f[i][j]);
+                    }
+                }
+                sum *= ((c[u] * c2[v]) / 4.0);
+                F[u][v] = sum;
+            }
+        }
+        return F;
+    }
+
+    public static class OCR implements com.stardust.mi666.ocr.OCR {
+
+        private SimpleTextDetector mSimpleTextDetector;
+        private Map<Character, boolean[]> mChars = new HashMap<>();
+        private ImagePHash mImagePHash;
+
+        public OCR(ColorDetector colorDetector, int size, int smallerSize) {
+            mSimpleTextDetector = new SimpleTextDetector(colorDetector);
+            mImagePHash = new ImagePHash(size, smallerSize);
+        }
+
+        public OCR(ColorDetector colorDetector, ImagePHash pHash) {
+            mSimpleTextDetector = new SimpleTextDetector(colorDetector);
+            mImagePHash = pHash;
+        }
+
+        @Override
+        public void addChar(char ch, Bitmap bitmap) {
+            mChars.put(ch, mImagePHash.getHash(mSimpleTextDetector.detect(bitmap)));
+        }
+
+        @Override
+        public char detect(Bitmap bitmap) {
+            bitmap = mSimpleTextDetector.detect(bitmap);
+            int min = Integer.MAX_VALUE;
+            boolean[] h = mImagePHash.getHash(bitmap);
+            char ch = ' ';
+            for (Map.Entry<Character, boolean[]> entry : mChars.entrySet()) {
+                int d = mImagePHash.distance(h, entry.getValue());
+                //Log.i(LOG_TAG, "char: " + entry.getKey() + " distance: " + d);
+                if (d < min) {
+                    min = d;
+                    ch = entry.getKey();
+                }
+            }
+            return ch;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/ImageSelector.java b/app/src/main/java/com/stardust/scriptdroid/tool/ImageSelector.java
index cf5347fc..b0f05bd8 100644
--- a/app/src/main/java/com/stardust/scriptdroid/tool/ImageSelector.java
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/ImageSelector.java
@@ -2,9 +2,6 @@ package com.stardust.scriptdroid.tool;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.MediaStore;
 
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.scriptdroid.R;
@@ -22,6 +19,8 @@ public class ImageSelector implements OnActivityResultDelegate {
         void onImageSelected(ImageSelector selector, InputStream path);
     }
 
+    private static final String TAG = ImageSelector.class.getSimpleName();
+
     private static final int REQUEST_CODE = "LOVE EATING".hashCode() >> 16;
     private Activity mActivity;
     private ImageSelectorCallback mCallback;
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/IntentTool.java b/app/src/main/java/com/stardust/scriptdroid/tool/IntentTool.java
new file mode 100644
index 00000000..06f60b19
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/IntentTool.java
@@ -0,0 +1,20 @@
+package com.stardust.scriptdroid.tool;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import com.stardust.scriptdroid.R;
+import com.stardust.util.IntentUtil;
+
+/**
+ * Created by Stardust on 2017/4/12.
+ */
+
+public class IntentTool {
+
+    public static void browse(Context context, String url){
+        if (!IntentUtil.browse(context, url)) {
+            Toast.makeText(context, R.string.text_no_brower, Toast.LENGTH_SHORT).show();
+        }
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/JsBeautifierFactory.java b/app/src/main/java/com/stardust/scriptdroid/tool/JsBeautifierFactory.java
new file mode 100644
index 00000000..9637f2a1
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/JsBeautifierFactory.java
@@ -0,0 +1,25 @@
+package com.stardust.scriptdroid.tool;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+
+import com.stardust.autojs.script.JsBeautifier;
+
+/**
+ * Created by Stardust on 2017/4/18.
+ */
+
+public class JsBeautifierFactory {
+
+    @SuppressLint("StaticFieldLeak")
+    private static JsBeautifier jsBeautifier;
+
+    public static JsBeautifier getJsBeautify() {
+        return jsBeautifier;
+    }
+
+    public static void initJsBeautify(Application context, String path) {
+        jsBeautifier = new JsBeautifier(context, path);
+        jsBeautifier.prepare();
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/MaterialDialogFactory.java b/app/src/main/java/com/stardust/scriptdroid/tool/MaterialDialogFactory.java
new file mode 100644
index 00000000..fe9f1a2f
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/MaterialDialogFactory.java
@@ -0,0 +1,26 @@
+package com.stardust.scriptdroid.tool;
+
+import android.content.Context;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.scriptdroid.R;
+
+/**
+ * Created by Stardust on 2017/4/18.
+ */
+
+public class MaterialDialogFactory {
+    public static MaterialDialog createProgress(Context context) {
+        return new MaterialDialog.Builder(context)
+                .progress(true, 0)
+                .cancelable(false)
+                .content(R.string.text_processing)
+                .build();
+    }
+
+    public static MaterialDialog showProgress(Context context) {
+        MaterialDialog dialog = createProgress(context);
+        dialog.show();
+        return dialog;
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/Shell.java b/app/src/main/java/com/stardust/scriptdroid/tool/Shell.java
new file mode 100644
index 00000000..63d99b8c
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/Shell.java
@@ -0,0 +1,161 @@
+package com.stardust.scriptdroid.tool;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import com.stardust.pio.UncheckedIOException;
+import com.stardust.scriptdroid.App;
+
+import java.io.IOException;
+
+import jackpal.androidterm.ShellTermSession;
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.util.TermSettings;
+
+/**
+ * Created by Stardust on 2017/4/24.
+ */
+
+public class Shell {
+
+    private TermSession mTermSession;
+    private String mOutput;
+
+    public Shell(boolean root) {
+        this(App.getApp(), root ? "su\n" : "sh\n");
+    }
+
+    public Shell(Context context, String initialCommand) {
+        TermSettings settings = new TermSettings(context.getResources(), PreferenceManager.getDefaultSharedPreferences(context));
+        try {
+            mTermSession = new MyShellTermSession(settings, initialCommand);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public String execAndWaitFor(String command) {
+        mTermSession.write(command + "\n");
+        mOutput = null;
+        synchronized (this) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return mOutput;
+    }
+
+    public String execAndWaitFor(String command, int millis) {
+        mTermSession.write(command + "\n");
+        mOutput = null;
+        synchronized (this) {
+            try {
+                wait(millis);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return mOutput;
+    }
+
+    public void exec(String command) {
+        mTermSession.write(command);
+    }
+
+    public void execute(String command) {
+        mTermSession.write(command);
+    }
+
+
+    public void Tap(int x, int y) {
+        execute("input tap " + x + " " + y);
+    }
+
+    public void Swipe(int x1, int y1, int x2, int y2) {
+        execute("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2);
+    }
+
+    public void Swipe(int x1, int y1, int x2, int y2, long duration) {
+        execute("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2 + " " + duration);
+    }
+
+    public void KeyCode(int keyCode) {
+        execute("input keyevent " + keyCode);
+    }
+
+    public void KeyCode(String keyCode) {
+        execute("input keyevent " + keyCode);
+    }
+
+    public void Home() {
+        KeyCode(3);
+    }
+
+    public void Back() {
+        KeyCode(4);
+    }
+
+    public void Power() {
+        KeyCode(26);
+    }
+
+    public void Up() {
+        KeyCode(19);
+    }
+
+    public void Down() {
+        KeyCode(20);
+    }
+
+    public void Left() {
+        KeyCode(21);
+    }
+
+    public void Right() {
+        KeyCode(22);
+    }
+
+    public void OK() {
+        KeyCode(23);
+    }
+
+    public void VolumeUp() {
+        KeyCode(24);
+    }
+
+    public void VolumeDown() {
+        KeyCode(25);
+    }
+
+    public void Menu() {
+        KeyCode(1);
+    }
+
+    public void Camera() {
+        KeyCode(27);
+    }
+
+    public void Text(String text) {
+        execute("input text " + text);
+    }
+
+    private class MyShellTermSession extends ShellTermSession {
+
+        public MyShellTermSession(TermSettings settings, String initialCommand) throws IOException {
+            super(settings, initialCommand);
+        }
+
+
+        @Override
+        protected void processInput(byte[] data, int offset, int count) {
+            mOutput = new String(data, offset, count);
+            synchronized (Shell.this) {
+                Shell.this.notifyAll();
+            }
+            appendToEmulator(data, offset, count);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/UpdateChecker.java b/app/src/main/java/com/stardust/scriptdroid/tool/UpdateChecker.java
index 93a69bc6..a85b130e 100644
--- a/app/src/main/java/com/stardust/scriptdroid/tool/UpdateChecker.java
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/UpdateChecker.java
@@ -13,7 +13,7 @@ import com.android.volley.toolbox.StringRequest;
 import com.android.volley.toolbox.Volley;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.stardust.pio.UncheckedIOException;
+import com.stardust.scriptdroid.BuildConfig;
 
 import java.lang.reflect.Type;
 import java.util.List;
@@ -28,37 +28,40 @@ public class UpdateChecker implements Response.Listener<String>, Response.ErrorL
     private RequestQueue mRequestQueue;
     private static final String UPDATE_URL = "https://raw.githubusercontent.com/hyb1996/NoRootScriptDroid/master/version.json";
 
-
     public interface Callback {
 
-        void onSuccess(CheckResult result);
+        void onSuccess(UpdateInfo result);
 
         void onError(Exception exception);
 
     }
 
-    private Callback mCallback;
-    private final int mTimeOut = 3000;
+    public static UpdateInfo savedResult;
 
-    public UpdateChecker(Context context, Callback callback) {
-        mCallback = callback;
+
+    private final int mTimeOut = 3000;
+    private Callback mCallback;
+
+    public UpdateChecker(Context context) {
         mRequestQueue = Volley.newRequestQueue(context);
     }
 
-    private CheckResult parse(String json) {
+    private UpdateInfo parse(String json) {
         Gson gson = new Gson();
-        Type type = new TypeToken<CheckResult>() {
+        Type type = new TypeToken<UpdateInfo>() {
         }.getType();
-        CheckResult result = gson.fromJson(json, type);
+        UpdateInfo result = gson.fromJson(json, type);
         Log.i(LOG_TAG, result.toString());
         return result;
     }
 
 
-    public void check() {
+    public void check(final Callback callback) {
+        mCallback = callback;
         StringRequest request = new StringRequest(Request.Method.GET, UPDATE_URL, this, this);
         request.setRetryPolicy(new DefaultRetryPolicy(mTimeOut, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
         request.setTag("update-check");
+        request.setShouldCache(false);
         mRequestQueue.add(request);
     }
 
@@ -66,12 +69,16 @@ public class UpdateChecker implements Response.Listener<String>, Response.ErrorL
     public void onErrorResponse(VolleyError error) {
         error.printStackTrace();
         mCallback.onError(error);
+        mCallback = null;
     }
 
     @Override
     public void onResponse(String response) {
         try {
-            CheckResult result = parse(response);
+            UpdateInfo result = parse(response);
+            savedResult = result;
+            if (mCallback == null)
+                return;
             if (result.isValid()) {
                 mCallback.onSuccess(result);
             } else {
@@ -81,13 +88,14 @@ public class UpdateChecker implements Response.Listener<String>, Response.ErrorL
             e.printStackTrace();
             mCallback.onError(e);
         }
+        mCallback = null;
     }
 
     public void cancel() {
         mRequestQueue.cancelAll("update-check");
     }
 
-    public static class CheckResult {
+    public static class UpdateInfo {
 
         public int versionCode;
         public String releaseNotes;
@@ -95,25 +103,34 @@ public class UpdateChecker implements Response.Listener<String>, Response.ErrorL
         public List<Download> downloads;
         public List<OldVersion> oldVersions;
         public int deprecated;
+        public String downloadUrl;
 
         public boolean isValid() {
             return downloads != null && !downloads.isEmpty() && versionCode > 0
                     && !TextUtils.isEmpty(versionName) && !TextUtils.isEmpty(releaseNotes);
         }
 
+        public OldVersion getOldVersion(int versionCode) {
+            for (OldVersion oldVersion : oldVersions) {
+                if (oldVersion.versionCode == versionCode) {
+                    return oldVersion;
+                }
+            }
+            return null;
+        }
+
         @Override
         public String toString() {
-            return "CheckResult{" +
+            return "UpdateInfo{" +
                     "versionCode=" + versionCode +
                     ", releaseNotes='" + releaseNotes + '\'' +
                     ", versionName='" + versionName + '\'' +
                     ", downloads=" + downloads +
                     ", oldVersions=" + oldVersions +
                     ", deprecated=" + deprecated +
+                    ", downloadUrl='" + downloadUrl + '\'' +
                     '}';
         }
-
-
     }
 
     public static class OldVersion {
diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/VersionInfo.java b/app/src/main/java/com/stardust/scriptdroid/tool/VersionInfo.java
new file mode 100644
index 00000000..2a1898f8
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/tool/VersionInfo.java
@@ -0,0 +1,129 @@
+package com.stardust.scriptdroid.tool;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import com.stardust.scriptdroid.BuildConfig;
+import com.stardust.util.NetworkUtils;
+
+/**
+ * Created by Stardust on 2017/4/9.
+ */
+
+public class VersionInfo {
+
+
+    private static final String KEY_DEPRECATED = "Still loving you...Can we go back...";
+    private static final String KEY_DEPRECATED_VERSION_CODE = "I miss you so much tonight...Baby don't let me cry...";
+
+    public interface OnReceiveUpdateResultCallback {
+        void onReceive(UpdateChecker.UpdateInfo info, boolean isCurrentVersionDeprecated);
+    }
+
+
+    private static VersionInfo instance = new VersionInfo();
+
+    public static VersionInfo getInstance() {
+        return instance;
+    }
+
+    private boolean mDeprecated = false;
+    private UpdateChecker.UpdateInfo mUpdateInfo;
+    private final int mReconnectTimes = 2;
+    private int mReconnectCount = 0;
+    private OnReceiveUpdateResultCallback mOnReceiveUpdateResultCallback;
+    private SharedPreferences mSharedPreferences;
+
+    public void readDeprecatedFromPref(Context context) {
+        mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (mSharedPreferences.getInt(KEY_DEPRECATED_VERSION_CODE, 0) < BuildConfig.VERSION_CODE) {
+            mSharedPreferences.edit().remove(KEY_DEPRECATED_VERSION_CODE)
+                    .putBoolean(KEY_DEPRECATED, false)
+                    .apply();
+        }
+        mDeprecated = mSharedPreferences.getBoolean(KEY_DEPRECATED, false);
+    }
+
+
+    public void readDeprecatedFromPrefIfNeeded(Context context) {
+        if (mSharedPreferences == null) {
+            readDeprecatedFromPref(context);
+        }
+    }
+
+    public boolean isCurrentVersionDeprecated() {
+        return mDeprecated;
+    }
+
+    public UpdateChecker.UpdateInfo getUpdateInfo() {
+        return mUpdateInfo;
+    }
+
+    public String getCurrentVersionIssues() {
+        if (mUpdateInfo == null)
+            return null;
+        UpdateChecker.OldVersion oldVersion = mUpdateInfo.getOldVersion(BuildConfig.VERSION_CODE);
+        if (oldVersion == null)
+            return null;
+        return oldVersion.issues;
+    }
+
+    public void checkUpdateIfNeeded(Context context) {
+        if (mUpdateInfo == null) {
+            checkUpdateIfUsingWifi(context);
+        }
+    }
+
+    public void setOnReceiveUpdateResultCallback(OnReceiveUpdateResultCallback onReceiveUpdateResultCallback) {
+        mOnReceiveUpdateResultCallback = onReceiveUpdateResultCallback;
+    }
+
+    private void checkUpdateIfUsingWifi(Context context) {
+        if (NetworkUtils.isWifiAvailable(context)) {
+            checkUpdate(context);
+        }
+
+    }
+
+    public void checkUpdate(Context context) {
+        mReconnectCount = 0;
+        checkUpdateInner(context);
+    }
+
+    private void checkUpdateInner(final Context context) {
+        mReconnectCount++;
+        new UpdateChecker(context).check(new UpdateChecker.Callback() {
+
+            @Override
+            public void onSuccess(UpdateChecker.UpdateInfo result) {
+                if (result.isValid()) {
+                    setUpdateInfo(result);
+                } else if (mReconnectCount < mReconnectTimes) {
+                    checkUpdate(context);
+                }
+            }
+
+            @Override
+            public void onError(Exception exception) {
+                if (mReconnectCount < mReconnectTimes) {
+                    checkUpdate(context);
+                }
+            }
+        });
+    }
+
+    private void setUpdateInfo(UpdateChecker.UpdateInfo result) {
+        mDeprecated = BuildConfig.VERSION_CODE <= result.deprecated;
+        mUpdateInfo = result;
+        if (mDeprecated) {
+            mSharedPreferences.edit().putBoolean(KEY_DEPRECATED, mDeprecated)
+                    .putInt(KEY_DEPRECATED_VERSION_CODE, BuildConfig.VERSION_CODE)
+                    .apply();
+        }
+        if (mOnReceiveUpdateResultCallback != null) {
+            mOnReceiveUpdateResultCallback.onReceive(result, mDeprecated);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
index e8e25fd7..eba39324 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
@@ -1,8 +1,10 @@
 package com.stardust.scriptdroid.ui;
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v7.app.AppCompatActivity;
@@ -10,8 +12,14 @@ import android.support.v7.widget.Toolbar;
 import android.view.View;
 
 
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.pio.PFile;
+import com.stardust.scriptdroid.App;
 import com.stardust.scriptdroid.R;
-import com.stardust.scriptdroid.external.tasker.TaskPrefEditActivity;
+import com.stardust.scriptdroid.tool.UpdateChecker;
+import com.stardust.scriptdroid.tool.VersionInfo;
+import com.stardust.scriptdroid.ui.update.UpdateCheckDialog;
 import com.stardust.theme.ThemeColorManager;
 import com.stardust.util.BackPressedHandler;
 
@@ -42,6 +50,20 @@ public abstract class BaseActivity extends AppCompatActivity {
         if ((getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) == 0) {
             ThemeColorManager.addActivityStatusBar(this);
         }
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        VersionInfo.getInstance().setOnReceiveUpdateResultCallback(null);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/console/TimberConsole.java b/app/src/main/java/com/stardust/scriptdroid/ui/console/TimberConsole.java
index f232e355..0343c6c0 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/console/TimberConsole.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/console/TimberConsole.java
@@ -22,15 +22,19 @@ import timber.log.Timber;
 public class TimberConsole implements Console {
 
     static {
-        Timber.plant(new ConsoleTree.Builder()
-                .minPriority(Log.VERBOSE)
-                .verboseColor(0xff909090)
-                .debugColor(0xffc88b48)
-                .infoColor(0xffc9c9c9)
-                .warnColor(0xffa97db6)
-                .errorColor(0xffff534e)
-                .assertColor(0xffff5540)
-                .build());
+        try {
+            Timber.plant(new ConsoleTree.Builder()
+                    .minPriority(Log.VERBOSE)
+                    .verboseColor(0xff909090)
+                    .debugColor(0xffc88b48)
+                    .infoColor(0xffc9c9c9)
+                    .warnColor(0xffa97db6)
+                    .errorColor(0xffff534e)
+                    .assertColor(0xffff5540)
+                    .build());
+        } catch (Exception e) {
+            // FIXME: 2017/4/26  java.lang.NoClassDefFoundError: com.jraska.console.timber.ConsoleTree at android4.4
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
index 775620f2..9fb52656 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
@@ -11,6 +11,8 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.util.SparseArray;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethod;
 
@@ -19,17 +21,24 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.ScriptExecutionListener;
 import com.stardust.autojs.script.FileScriptSource;
+import com.stardust.autojs.script.JsBeautifier;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.autojs.script.StringScriptSource;
+import com.stardust.enhancedfloaty.ResizableFloatyService;
 import com.stardust.pio.PFile;
 import com.stardust.scriptdroid.Pref;
 import com.stardust.scriptdroid.autojs.AutoJs;
+import com.stardust.scriptdroid.external.floating_window.FloatingConsole;
 import com.stardust.scriptdroid.scripts.ScriptFile;
+import com.stardust.scriptdroid.tool.JsBeautifierFactory;
+import com.stardust.scriptdroid.tool.MaterialDialogFactory;
 import com.stardust.scriptdroid.ui.BaseActivity;
+import com.stardust.scriptdroid.ui.console.ConsoleActivity;
 import com.stardust.scriptdroid.ui.edit.editor920.Editor920Activity;
 import com.stardust.scriptdroid.ui.edit.editor920.Editor920Utils;
 import com.stardust.scriptdroid.ui.edit.sidemenu.EditSideMenuFragment;
 import com.stardust.scriptdroid.ui.edit.sidemenu.FunctionListRecyclerView;
+import com.stardust.scriptdroid.ui.help.HelpCatalogueActivity;
 import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
 import com.stardust.util.SparseArrayEntries;
 import com.stardust.view.ViewBinding;
@@ -56,6 +65,7 @@ import timber.log.Timber;
 
 public class EditActivity extends Editor920Activity {
 
+
     public static class InputMethodEnhanceBarBridge implements InputMethodEnhanceBar.EditTextBridge {
 
         private Editor920Activity mEditor920Activity;
@@ -152,6 +162,7 @@ public class EditActivity extends Editor920Activity {
             }
         }
     };
+    private JsBeautifier mJsBeautifier = JsBeautifierFactory.getJsBeautify();
 
     public void onCreate(Bundle b) {
         super.onCreate(b);
@@ -314,6 +325,51 @@ public class EditActivity extends Editor920Activity {
         menuItem.setEnabled(!disabled);
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_editor, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_console:
+                startActivity(new Intent(getContext(), ConsoleActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                return true;
+            case R.id.action_help:
+                HelpCatalogueActivity.showMainCatalogue(this);
+                return true;
+            case R.id.action_beautify:
+                beautifyCode();
+                return true;
+
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void beautifyCode() {
+        final MaterialDialog dialog = MaterialDialogFactory.showProgress(this);
+        mJsBeautifier.beautify(mEditorDelegate.getText(), new JsBeautifier.Callback() {
+            @Override
+            public void onSuccess(final String beautifiedCode) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mEditorDelegate.mEditText.setText(beautifiedCode);
+                        dialog.dismiss();
+                    }
+                });
+            }
+
+            @Override
+            public void onException(Exception e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
     @Override
     public void finish() {
         if (!mReadOnly && mEditorDelegate.isChanged()) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java
index b07dd5d3..fdd1197c 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java
@@ -122,7 +122,7 @@ public class CodeCompletion implements TextWatcher {
     }
 
     private Collection<CodeCompletionItem> searchWordCompletion(String str) {
-        if (mEditText.getEditableText().length() < Pref.MaxTextLengthForCodeCompletion()) {
+        if (mEditText.getEditableText().length() < Pref.getMaxTextLengthForCodeCompletion()) {
             return searchCodeCompletion(str, splitWord(mEditText.getEditableText().toString()));
         }
         return new TreeSet<>();
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/sidemenu/HelpSideMenuFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/sidemenu/HelpSideMenuFragment.java
new file mode 100644
index 00000000..57c94f4c
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/sidemenu/HelpSideMenuFragment.java
@@ -0,0 +1,24 @@
+package com.stardust.scriptdroid.ui.edit.sidemenu;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.stardust.app.Fragment;
+import com.stardust.scriptdroid.R;
+
+/**
+ * Created by Stardust on 2017/4/18.
+ */
+
+public class HelpSideMenuFragment extends Fragment {
+
+
+    @Nullable
+    @Override
+    public View createView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_help_side_menu, container, false);
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
index 595c7fce..b46cb8f7 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
@@ -25,26 +25,27 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.app.FragmentPagerAdapterBuilder;
 import com.stardust.app.NotAskAgainDialog;
 import com.stardust.app.OnActivityResultDelegate;
+import com.stardust.scriptdroid.BuildConfig;
+import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.scripts.ScriptFile;
 import com.stardust.scriptdroid.scripts.StorageScriptProvider;
 import com.stardust.scriptdroid.service.AccessibilityWatchDogService;
 import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
 import com.stardust.scriptdroid.tool.DrawableSaver;
 import com.stardust.scriptdroid.ui.BaseActivity;
-import com.stardust.scriptdroid.ui.main.script_list.MyScriptListFragment;
 import com.stardust.scriptdroid.ui.main.sample_list.SampleScriptListFragment;
+import com.stardust.scriptdroid.ui.main.script_list.MyScriptListFragment;
 import com.stardust.scriptdroid.ui.main.script_list.ScriptFileChooserDialogBuilder;
 import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment;
 import com.stardust.scriptdroid.ui.settings.SettingsActivity;
+import com.stardust.scriptdroid.ui.update.VersionGuard;
 import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
 import com.stardust.util.BackPressedHandler;
 import com.stardust.util.MessageEvent;
-import com.stardust.view.ViewBinding;
-import com.stardust.widget.SlidingUpPanel;
-import com.stardust.scriptdroid.BuildConfig;
-import com.stardust.scriptdroid.R;
 import com.stardust.view.ViewBinder;
+import com.stardust.view.ViewBinding;
 import com.stardust.view.accessibility.AccessibilityServiceUtils;
+import com.stardust.widget.SlidingUpPanel;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -68,6 +69,7 @@ public class MainActivity extends BaseActivity {
 
     private OnActivityResultDelegate.Intermediary mActivityResultIntermediary = new OnActivityResultDelegate.Intermediary();
     private DrawableSaver mDrawerHeaderBackgroundSaver, mAppbarBackgroundSaver;
+    private VersionGuard mVersionGuard;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -77,8 +79,11 @@ public class MainActivity extends BaseActivity {
         registerBackPressHandlers();
         handleIntent(getIntent());
         EventBus.getDefault().register(this);
+        mVersionGuard = new VersionGuard(this);
     }
 
+
+
     private void registerBackPressHandlers() {
         registerBackPressedHandler(new BackPressedHandler() {
             @Override
@@ -101,7 +106,7 @@ public class MainActivity extends BaseActivity {
 
     private void showAccessibilitySettingPromptIfDisabled() {
         if (!AccessibilityServiceUtils.isAccessibilityServiceEnabled(this, AccessibilityWatchDogService.class)) {
-            new NotAskAgainDialog.Builder(this, "showAccessibilitySettingPromptIfDisabled")
+            new NotAskAgainDialog.Builder(this, "Eating...love you...miss you...17.4.12")
                     .title(R.string.text_need_to_enable_accessibility_service)
                     .content(R.string.explain_accessibility_permission)
                     .positiveText(R.string.text_go_to_setting)
@@ -279,24 +284,6 @@ public class MainActivity extends BaseActivity {
         return ((MyScriptListFragment) mPagerAdapter.getStoredFragment(0));
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        mActivityResultIntermediary.onActivityResult(requestCode, resultCode, data);
-    }
-
-    public static void onActionRecordStopped(Context context, String script) {
-        Intent intent = new Intent(context, MainActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(EXTRA_ACTION, ACTION_ON_ACTION_RECORD_STOPPED)
-                .putExtra(ARGUMENT_SCRIPT, script);
-        context.startActivity(intent);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        StorageScriptProvider.getDefault().notifyStoragePermissionGranted();
-    }
-
     @ViewBinding.Click(R.id.toolbar)
     public void OnToolbarClick() {
         mAppbarBackgroundSaver.select(this, mActivityResultIntermediary);
@@ -310,9 +297,36 @@ public class MainActivity extends BaseActivity {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mActivityResultIntermediary.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        StorageScriptProvider.getDefault().notifyStoragePermissionGranted();
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mVersionGuard.checkDeprecateAndUpdate();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
+
+    public static void onRecordStop(Context context, String script) {
+        Intent intent = new Intent(context, MainActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra(EXTRA_ACTION, ACTION_ON_ACTION_RECORD_STOPPED)
+                .putExtra(ARGUMENT_SCRIPT, script);
+        context.startActivity(intent);
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/settings/AboutActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/settings/AboutActivity.java
index 020ffd24..7b5d69fa 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/settings/AboutActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/settings/AboutActivity.java
@@ -12,6 +12,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.scriptdroid.tool.IntentTool;
 import com.stardust.scriptdroid.ui.BaseActivity;
 import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
 import com.stardust.util.IntentUtil;
@@ -51,9 +52,7 @@ public class AboutActivity extends BaseActivity {
 
     @ViewBinding.Click(R.id.github)
     private void openGitHub() {
-        if (!IntentUtil.browse(this, getString(R.string.my_github))) {
-            Toast.makeText(this, R.string.text_no_brower, Toast.LENGTH_SHORT).show();
-        }
+        IntentTool.browse(this, getString(R.string.my_github));
     }
 
     @ViewBinding.Click(R.id.qq)
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateCheckDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateCheckDialog.java
index 6dd015d0..ce32fada 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateCheckDialog.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateCheckDialog.java
@@ -1,7 +1,6 @@
 package com.stardust.scriptdroid.ui.update;
 
 import android.content.Context;
-import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.widget.Toast;
 
@@ -12,8 +11,7 @@ import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.tool.UpdateChecker;
 import com.stardust.util.IntentUtil;
 
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.LinkedList;
 
 /**
  * Created by Stardust on 2017/4/9.
@@ -21,7 +19,6 @@ import java.util.TimerTask;
 
 public class UpdateCheckDialog implements UpdateChecker.Callback {
 
-    private MaterialDialog mResultDialog;
     private MaterialDialog mProgressDialog;
     private Context mContext;
     private UpdateChecker mUpdateChecker;
@@ -29,70 +26,42 @@ public class UpdateCheckDialog implements UpdateChecker.Callback {
 
     public UpdateCheckDialog(Context context) {
         mContext = context;
-        mUpdateChecker = new UpdateChecker(context, this);
+        mUpdateChecker = new UpdateChecker(context);
     }
 
     public void show() {
+        if (mProgressDialog != null)
+            throw new IllegalStateException();
         mProgressDialog = new MaterialDialog.Builder(mContext)
                 .content(mContext.getString(R.string.text_checking_update))
                 .progress(true, 0)
                 .cancelable(false)
                 .show();
-        mUpdateChecker.check();
+        mUpdateChecker.check(this);
     }
 
     @Override
-    public void onSuccess(UpdateChecker.CheckResult result) {
+    public void onSuccess(UpdateChecker.UpdateInfo result) {
         mProgressDialog.dismiss();
         if (BuildConfig.VERSION_CODE >= result.versionCode) {
             Toast.makeText(mContext, R.string.text_is_latest_version, Toast.LENGTH_SHORT).show();
             return;
         }
-        mResultDialog = buildDialog(result);
-        mResultDialog.show();
-        String updateSite = result.downloads.get(0).name;
-        final String updateUrl = result.downloads.get(0).url;
-        mResultDialog = new MaterialDialog.Builder(mContext)
-                .title(mContext.getString(R.string.text_new_version) + " " + result.versionName)
-                .content(result.releaseNotes)
-                .positiveText(updateSite)
-                .onPositive(new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        IntentUtil.browse(mContext, updateUrl);
-                    }
-                })
+        new UpdateInfoDialogBuilder(mContext, result)
                 .show();
-    }
-
-    private MaterialDialog buildDialog(final UpdateChecker.CheckResult result) {
-        String updateSite = result.downloads.get(0).name;
-        final String updateUrl = result.downloads.get(0).url;
-        MaterialDialog.Builder builder = new MaterialDialog.Builder(mContext)
-                .title(mContext.getString(R.string.text_new_version) + " " + result.versionName)
-                .content(result.releaseNotes)
-                .positiveText(updateSite)
-                .onPositive(new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        IntentUtil.browse(mContext, updateUrl);
-                    }
-                });
-        if (result.downloads.size() > 1) {
-            builder.negativeText(result.downloads.get(1).name)
-                    .onNegative(new MaterialDialog.SingleButtonCallback() {
-                        @Override
-                        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                            IntentUtil.browse(mContext, result.downloads.get(1).url);
-                        }
-                    });
-        }
-        return builder.build();
+        clear();
     }
 
     @Override
     public void onError(Exception exception) {
         mProgressDialog.dismiss();
         Toast.makeText(mContext, R.string.text_check_update_error, Toast.LENGTH_SHORT).show();
+        clear();
     }
+
+    private void clear() {
+        mProgressDialog = null;
+        mContext = null;
+    }
+
 }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java
new file mode 100644
index 00000000..c02b57de
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java
@@ -0,0 +1,146 @@
+package com.stardust.scriptdroid.ui.update;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.scriptdroid.BuildConfig;
+import com.stardust.scriptdroid.R;
+import com.stardust.scriptdroid.scripts.StorageScriptProvider;
+import com.stardust.scriptdroid.tool.IntentTool;
+import com.stardust.scriptdroid.tool.UpdateChecker;
+import com.stardust.util.DownloadTask;
+import com.stardust.util.IntentUtil;
+import com.stardust.widget.CommonMarkdownView;
+
+/**
+ * Created by Stardust on 2017/4/9.
+ */
+
+public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
+
+    private static final String KEY_DO_NOT_ASK_AGAIN_FOR_VERSION = "I cannot forget you...cannot help missing you...";
+    private View mView;
+    private SharedPreferences mSharedPreferences;
+    private UpdateChecker.UpdateInfo mUpdateInfo;
+
+    public UpdateInfoDialogBuilder(@NonNull Context context, UpdateChecker.UpdateInfo info) {
+        super(context);
+        mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        updateInfo(info);
+    }
+
+    public UpdateInfoDialogBuilder updateInfo(UpdateChecker.UpdateInfo info) {
+        mUpdateInfo = info;
+        mView = View.inflate(context, R.layout.dialog_update_info, null);
+        setReleaseNotes(mView, info);
+        setCurrentVersionIssues(mView, info);
+        setUpdateDownloadButtons(mView, info);
+        title(context.getString(R.string.text_new_version) + " " + info.versionName);
+        customView(mView, false);
+        return this;
+    }
+
+    public UpdateInfoDialogBuilder showDoNotAskAgain() {
+        mView.findViewById(R.id.do_not_ask_again_container).setVisibility(View.VISIBLE);
+        CheckBox checkBox = (CheckBox) mView.findViewById(R.id.do_not_ask_again);
+        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                mSharedPreferences.edit().putBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mUpdateInfo.versionCode, isChecked).apply();
+            }
+        });
+        return this;
+    }
+
+    @Override
+    public MaterialDialog show() {
+        if (mSharedPreferences.getBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mUpdateInfo.versionCode, false)) {
+            return null;
+        }
+        return super.show();
+    }
+
+    private void setCurrentVersionIssues(View view, UpdateChecker.UpdateInfo info) {
+        TextView issues = (TextView) view.findViewById(R.id.issues);
+        UpdateChecker.OldVersion currentVersion = info.getOldVersion(BuildConfig.VERSION_CODE);
+        if (currentVersion == null) {
+            issues.setVisibility(View.GONE);
+        } else {
+            issues.setText(currentVersion.issues);
+        }
+    }
+
+    private void setUpdateDownloadButtons(View view, UpdateChecker.UpdateInfo info) {
+        LinearLayout downloads = (LinearLayout) view.findViewById(R.id.downloads);
+        setDirectlyDownloadButton(downloads, info);
+        for (final UpdateChecker.Download download : info.downloads) {
+            Button button = (Button) View.inflate(getContext(), R.layout.dialog_update_info_btn, null);
+            button.setText(download.name);
+            downloads.addView(button);
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    IntentTool.browse(v.getContext(), download.url);
+                }
+            });
+        }
+    }
+
+    private void setDirectlyDownloadButton(LinearLayout container, final UpdateChecker.UpdateInfo info) {
+        if (TextUtils.isEmpty(info.downloadUrl)) {
+            return;
+        }
+        Button button = (Button) View.inflate(getContext(), R.layout.dialog_update_info_btn, null);
+        button.setText(R.string.text_directly_download);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                directlyDownload(info.downloadUrl);
+            }
+        });
+        container.addView(button);
+    }
+
+    private void directlyDownload(String downloadUrl) {
+        final MaterialDialog dialog = new MaterialDialog.Builder(getContext())
+                .title(R.string.text_downloading)
+                .progress(false, 100)
+                .show();
+        final String path = StorageScriptProvider.DEFAULT_DIRECTORY_PATH + "AutoJs.apk";
+        final DownloadTask task = new DownloadTask() {
+            @Override
+            protected void onProgressUpdate(Integer... values) {
+                super.onProgressUpdate(values);
+                dialog.setProgress(values[0]);
+            }
+
+            @Override
+            protected void onPostExecute(Boolean result) {
+                super.onPostExecute(result);
+                dialog.dismiss();
+                if (!result) {
+                    Toast.makeText(getContext(), R.string.text_download_failed, Toast.LENGTH_SHORT).show();
+                } else {
+                    IntentUtil.installApk(getContext(), path);
+                }
+            }
+        };
+        task.execute(downloadUrl, path);
+    }
+
+    private void setReleaseNotes(View view, UpdateChecker.UpdateInfo info) {
+        CommonMarkdownView markdownView = (CommonMarkdownView) view.findViewById(R.id.release_notes);
+        markdownView.loadMarkdown(info.releaseNotes);
+    }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/update/VersionGuard.java b/app/src/main/java/com/stardust/scriptdroid/ui/update/VersionGuard.java
new file mode 100644
index 00000000..5eb90324
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/update/VersionGuard.java
@@ -0,0 +1,94 @@
+package com.stardust.scriptdroid.ui.update;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.scriptdroid.R;
+import com.stardust.scriptdroid.tool.UpdateChecker;
+import com.stardust.scriptdroid.tool.VersionInfo;
+
+/**
+ * Created by Stardust on 2017/4/12.
+ */
+
+public class VersionGuard {
+
+
+    private Activity mActivity;
+    private MaterialDialog mDeprecatedDialog;
+    private VersionInfo mVersionInfo = VersionInfo.getInstance();
+
+    public VersionGuard(Activity activity) {
+        mActivity = activity;
+    }
+
+    public void checkDeprecateAndUpdate() {
+        mVersionInfo.readDeprecatedFromPrefIfNeeded(mActivity);
+        if (mVersionInfo.isCurrentVersionDeprecated()) {
+            showDeprecatedDialogIfNeeded();
+        } else {
+            checkUpdateIfNeeded();
+        }
+    }
+
+    private void checkUpdateIfNeeded() {
+        if (mVersionInfo.getUpdateInfo() == null) {
+            mVersionInfo.setOnReceiveUpdateResultCallback(new VersionInfo.OnReceiveUpdateResultCallback() {
+                @Override
+                public void onReceive(UpdateChecker.UpdateInfo info, boolean isCurrentVersionDeprecated) {
+                    mVersionInfo.setOnReceiveUpdateResultCallback(null);
+                    if (isCurrentVersionDeprecated) {
+                        showDeprecatedDialogIfNeeded();
+                    } else {
+                        showUpdateInfo(info);
+                    }
+                }
+            });
+            mVersionInfo.checkUpdateIfNeeded(mActivity);
+        }
+    }
+
+    private void showUpdateInfo(UpdateChecker.UpdateInfo info) {
+        new UpdateInfoDialogBuilder(mActivity, info)
+                .showDoNotAskAgain()
+                .show();
+    }
+
+    private void showDeprecatedDialogIfNeeded() {
+        if (mDeprecatedDialog != null && mDeprecatedDialog.isShowing())
+            return;
+        String content = mActivity.getString(R.string.warning_version_too_old);
+        String issues = mVersionInfo.getCurrentVersionIssues();
+        if (issues != null) {
+            content += "\n" + issues;
+        }
+        mDeprecatedDialog = new MaterialDialog.Builder(mActivity)
+                .title(R.string.text_version_too_old)
+                .content(content)
+                .positiveText(R.string.text_update)
+                .negativeText(R.string.text_exit)
+                .cancelable(false)
+                .autoDismiss(false)
+                .onAny(new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        if (which == DialogAction.POSITIVE) {
+                            new UpdateCheckDialog(mActivity)
+                                    .show();
+                        } else {
+                            mActivity.finish();
+                        }
+                    }
+                })
+                .dismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        mDeprecatedDialog = null;
+                    }
+                })
+                .show();
+    }
+}
diff --git a/app/src/main/java/com/stardust/view/ResizableFloaty.java b/app/src/main/java/com/stardust/view/ResizableFloaty.java
deleted file mode 100644
index fa45f38d..00000000
--- a/app/src/main/java/com/stardust/view/ResizableFloaty.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package com.stardust.view;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.PixelFormat;
-import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v4.view.GestureDetectorCompat;
-import android.util.DisplayMetrics;
-import android.view.GestureDetector;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.RelativeLayout;
-
-import com.stardust.scriptdroid.R;
-import com.stardust.util.ViewUtil;
-import com.stardust.widget.ViewSwitcher;
-
-/**
- * Created by Stardust on 2017/3/11.
- */
-
-public class ResizableFloaty {
-
-    private static final String TAG = "ResizableFloaty";
-
-    private View mCollapsedView, mExpandedView;
-    private static ResizableFloaty floaty;
-
-    public ResizableFloaty(View collapsedView, View expandedView) {
-        mExpandedView = expandedView;
-        mCollapsedView = collapsedView;
-    }
-
-    public static void startService(Context context, View collapsedView, View expandedView) {
-        floaty = new ResizableFloaty(collapsedView, expandedView);
-        context.startService(new Intent(context, FloatingWindowService.class));
-    }
-
-    interface WindowBridge {
-        int getX();
-
-        int getY();
-
-        void updatePosition(int x, int y);
-
-        int getWidth();
-
-        int getHeight();
-
-        void updateMeasure(int width, int height);
-
-        int getScreenWidth();
-
-        int getScreenHeight();
-    }
-
-    public static class FloatingWindowService extends Service {
-
-        private WindowManager mWindowManager;
-        private WindowManager.LayoutParams mWindowLayoutParams;
-        private RelativeLayout mWindowView;
-        private ViewSwitcher mCollapseExpandViewSwitcher;
-        private View mResizer;
-        private ResizableFloaty mFloaty = floaty;
-        private ResizeGesture mResizeGesture;
-        private DragGesture mDragGesture;
-        private ViewStack mViewStack = new ViewStack(new ViewStack.CurrentViewSetter() {
-            @Override
-            public void setCurrentView(View v) {
-                mCollapseExpandViewSwitcher.setSecondView(v);
-            }
-        });
-
-        private WindowBridge mWindowBridge = new WindowBridge() {
-            DisplayMetrics mDisplayMetrics;
-
-            @Override
-            public int getX() {
-                return mWindowLayoutParams.x;
-            }
-
-            @Override
-            public int getY() {
-                return mWindowLayoutParams.y;
-            }
-
-            @Override
-            public void updatePosition(int x, int y) {
-                mWindowLayoutParams.x = x;
-                mWindowLayoutParams.y = y;
-                mWindowManager.updateViewLayout(mWindowView, mWindowLayoutParams);
-            }
-
-            @Override
-            public int getWidth() {
-                return mWindowView.getWidth();
-            }
-
-            @Override
-            public int getHeight() {
-                return mWindowView.getHeight();
-            }
-
-            @Override
-            public void updateMeasure(int width, int height) {
-                mWindowLayoutParams.width = width;
-                mWindowLayoutParams.height = height;
-                mWindowManager.updateViewLayout(mWindowView, mWindowLayoutParams);
-            }
-
-            @Override
-            public int getScreenWidth() {
-                ensureDisplayMetrics();
-                return mDisplayMetrics.widthPixels;
-            }
-
-            @Override
-            public int getScreenHeight() {
-                ensureDisplayMetrics();
-                return mDisplayMetrics.heightPixels;
-            }
-
-            private void ensureDisplayMetrics() {
-                if (mDisplayMetrics == null) {
-                    mDisplayMetrics = new DisplayMetrics();
-                    mWindowManager.getDefaultDisplay().getMetrics(mDisplayMetrics);
-                }
-            }
-        };
-
-        @Nullable
-        @Override
-        public IBinder onBind(Intent intent) {
-            return null;
-        }
-
-        @Override
-        public void onCreate() {
-            super.onCreate();
-            mWindowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
-            mWindowLayoutParams = createWindowLayoutParams();
-            initWindowView();
-            initGesture();
-            setUpListeners();
-        }
-
-        private void setUpListeners() {
-            mDragGesture.setOnDraggedViewClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    enableWindowFocus();
-                    expand();
-                }
-            });
-            mWindowView.setOnKeyListener(new View.OnKeyListener() {
-                @Override
-                public boolean onKey(View v, int keyCode, KeyEvent event) {
-                    if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
-                        onBackPressed();
-                        return true;
-                    }
-                    if (keyCode == KeyEvent.KEYCODE_HOME) {
-                        onHomePressed();
-                        return true;
-                    }
-                    return false;
-                }
-
-
-            });
-        }
-
-        private void expand() {
-            mCollapseExpandViewSwitcher.showSecond();
-            mResizeGesture.setResizeEnabled(true);
-            mDragGesture.setKeepToSide(false);
-        }
-
-        private void onBackPressed() {
-            if (mViewStack.canGoBack()) {
-                mViewStack.goBack();
-            } else {
-                collapse();
-            }
-        }
-
-        private void onHomePressed() {
-            mViewStack.goBackToFirst();
-            collapse();
-        }
-
-        private void collapse() {
-            mCollapseExpandViewSwitcher.showFirst();
-            disableWindowFocus();
-            mResizeGesture.setResizeEnabled(false);
-            mDragGesture.setKeepToSide(true);
-        }
-
-        private void disableWindowFocus() {
-            mWindowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-            mWindowManager.updateViewLayout(mWindowView, mWindowLayoutParams);
-        }
-
-        private void initGesture() {
-            mResizeGesture = ResizeGesture.enableResize(mResizer, mWindowBridge);
-            mDragGesture = DragGesture.enableDrag(mWindowView, mWindowBridge);
-            mResizeGesture.setResizeEnabled(false);
-            mDragGesture.setKeepToSide(true);
-        }
-
-        private void enableWindowFocus() {
-            mWindowLayoutParams.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-            mWindowManager.updateViewLayout(mWindowView, mWindowLayoutParams);
-            mWindowView.requestFocus();
-        }
-
-        private void initWindowView() {
-            mWindowView = (RelativeLayout) View.inflate(getApplicationContext(), R.layout.resizable_floaty_container, null);
-            mWindowView.setFocusableInTouchMode(true);
-            mCollapseExpandViewSwitcher = (ViewSwitcher) mWindowView.findViewById(R.id.container);
-            mResizer = mWindowView.findViewById(R.id.resizer);
-            ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            mCollapseExpandViewSwitcher.addView(floaty.mCollapsedView, params);
-            mCollapseExpandViewSwitcher.addView(floaty.mExpandedView, params);
-            mViewStack.setRootView(floaty.mExpandedView);
-            mWindowManager.addView(mWindowView, mWindowLayoutParams);
-        }
-
-        private WindowManager.LayoutParams createWindowLayoutParams() {
-            WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(
-                    WindowManager.LayoutParams.WRAP_CONTENT,
-                    WindowManager.LayoutParams.WRAP_CONTENT,
-                    WindowManager.LayoutParams.TYPE_PHONE,
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                    PixelFormat.TRANSLUCENT);
-            layoutParams.gravity = Gravity.TOP | Gravity.START;
-            return layoutParams;
-        }
-    }
-
-    public static class DragGesture extends GestureDetector.SimpleOnGestureListener {
-
-        public static DragGesture enableDrag(final View view, WindowBridge bridge) {
-            final DragGesture gestureListener = new DragGesture(bridge, view) {
-                @Override
-                public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-                    view.setAlpha(0.8f);
-                    return super.onScroll(e1, e2, distanceX, distanceY);
-                }
-
-            };
-            final GestureDetectorCompat gestureDetector = new GestureDetectorCompat(view.getContext(), gestureListener);
-            view.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    gestureDetector.onTouchEvent(event);
-                    if (event.getAction() == MotionEvent.ACTION_UP) {
-                        view.setAlpha(1.0f);
-                        if (!gestureListener.mFlung && gestureListener.isKeepToSide()) {
-                            gestureListener.keepToSide();
-                        }
-                    }
-                    return true;
-                }
-            });
-            return gestureListener;
-        }
-
-        private WindowBridge mWindowBridge;
-        private boolean mKeepToSide;
-        private View.OnClickListener mOnClickListener;
-        private View mView;
-
-        private int initialX;
-        private int initialY;
-        private float initialTouchX;
-        private float initialTouchY;
-
-        private boolean mFlung = false;
-
-        public DragGesture(WindowBridge windowBridge, View view) {
-            mWindowBridge = windowBridge;
-            mView = view;
-        }
-
-        public void setKeepToSide(boolean keepToSide) {
-            mKeepToSide = keepToSide;
-        }
-
-        public boolean isKeepToSide() {
-            return mKeepToSide;
-        }
-
-        @Override
-        public boolean onDown(MotionEvent event) {
-            initialX = mWindowBridge.getX();
-            initialY = mWindowBridge.getY();
-            initialTouchX = event.getRawX();
-            initialTouchY = event.getRawY();
-            mFlung = false;
-            return false;
-        }
-
-        @Override
-        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            mWindowBridge.updatePosition(initialX + (int) ((e2.getRawX() - initialTouchX)),
-                    initialY + (int) ((e2.getRawY() - initialTouchY)));
-            return false;
-        }
-
-        @Override
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            mFlung = true;
-            if (mKeepToSide)
-                keepToSide();
-            return false;
-        }
-
-        public void keepToSide() {
-            int newX = mWindowBridge.getX();
-            if (newX > mWindowBridge.getScreenWidth() / 2)
-                mWindowBridge.updatePosition(mWindowBridge.getScreenWidth(), mWindowBridge.getY());
-            else
-                mWindowBridge.updatePosition(0, mWindowBridge.getY());
-        }
-
-        @Override
-        public boolean onSingleTapConfirmed(MotionEvent e) {
-            if (mOnClickListener != null)
-                mOnClickListener.onClick(mView);
-            return super.onSingleTapConfirmed(e);
-        }
-
-        public void setOnDraggedViewClickListener(View.OnClickListener onClickListener) {
-            mOnClickListener = onClickListener;
-        }
-    }
-
-    public static class ResizeGesture extends GestureDetector.SimpleOnGestureListener {
-
-        public static ResizeGesture enableResize(View resizer, WindowBridge windowBridge) {
-            ResizeGesture resizeGesture = new ResizeGesture(windowBridge, resizer);
-            final GestureDetector detector = new GestureDetector(resizer.getContext(), resizeGesture);
-            resizer.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    detector.onTouchEvent(event);
-                    return true;
-                }
-            });
-            return resizeGesture;
-        }
-
-        private WindowBridge mWindowBridge;
-        private float initialTouchX;
-        private float initialTouchY;
-        private int mInitialWidth, mInitialHeight;
-        private View mResizerView;
-        private int mMinHeight = 200, mMinWidth = 200;
-        private final int mStatusBarHeight;
-
-
-        public ResizeGesture(WindowBridge windowBridge, View resizerView) {
-            mWindowBridge = windowBridge;
-            mResizerView = resizerView;
-            mStatusBarHeight = ViewUtil.getStatusBarHeight(resizerView.getContext());
-        }
-
-        public void setMinHeight(int minHeight) {
-            mMinHeight = minHeight;
-        }
-
-        public void setMinWidth(int minWidth) {
-            mMinWidth = minWidth;
-        }
-
-        public void setResizeEnabled(boolean enabled) {
-            mResizerView.setVisibility(enabled ? View.VISIBLE : View.GONE);
-        }
-
-        @Override
-        public boolean onDown(MotionEvent event) {
-            initialTouchX = event.getRawX();
-            initialTouchY = event.getRawY();
-            mInitialWidth = mWindowBridge.getWidth();
-            mInitialHeight = mWindowBridge.getHeight();
-            return false;
-        }
-
-        @Override
-        public boolean onScroll(MotionEvent e1, final MotionEvent e2, float distanceX, float distanceY) {
-            int newWidth = mInitialWidth + (int) ((e2.getRawX() - initialTouchX));
-            int newHeight = mInitialHeight + (int) ((e2.getRawY() - initialTouchY));
-            newWidth = Math.max(mMinWidth, newWidth);
-            newHeight = Math.max(mMinHeight, newHeight);
-            newWidth = Math.min(mWindowBridge.getScreenWidth() - mWindowBridge.getX() - mResizerView.getWidth(), newWidth);
-            newHeight = Math.min(mWindowBridge.getScreenHeight() - mWindowBridge.getY() - mResizerView.getHeight() - mStatusBarHeight, newHeight);
-            mWindowBridge.updateMeasure(newWidth, newHeight);
-            return true;
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/com/stardust/widget/ViewSwitcher.java b/app/src/main/java/com/stardust/widget/ViewSwitcher.java
deleted file mode 100644
index aa99e07d..00000000
--- a/app/src/main/java/com/stardust/widget/ViewSwitcher.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stardust.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-/**
- * Created by Stardust on 2017/3/11.
- */
-
-public class ViewSwitcher extends android.widget.ViewSwitcher {
-
-    private View mCurrentView;
-
-    public ViewSwitcher(Context context) {
-        super(context);
-    }
-
-    public ViewSwitcher(Context context, View first, View second) {
-        super(context);
-        addView(first);
-        addView(second);
-    }
-
-    public ViewSwitcher(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public View getCurrentView() {
-        return mCurrentView;
-    }
-
-    public int getCurrentViewIndex() {
-        return mCurrentView == getChildAt(0) ? 0 : 1;
-    }
-
-    public void showFirst() {
-        ensureCurrentView();
-        if (mCurrentView != getChildAt(0)) {
-            showPrevious();
-            mCurrentView = getChildAt(0);
-        }
-    }
-
-    private void ensureCurrentView() {
-        if (mCurrentView == null) {
-            mCurrentView = getChildAt(0);
-        }
-    }
-
-    public void showSecond() {
-        ensureCurrentView();
-        if (mCurrentView != getChildAt(1)) {
-            showNext();
-            mCurrentView = getChildAt(1);
-        }
-    }
-
-    public void setSecondView(View v) {
-        removeViewAt(1);
-        addView(v);
-    }
-}
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 00000000..ceb1a1ee
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_ethernet_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_ethernet_white_24dp.png
new file mode 100644
index 00000000..f115320f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_ethernet_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 00000000..af7f8288
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings_ethernet_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_ethernet_white_24dp.png
new file mode 100644
index 00000000..40430c13
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_ethernet_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
new file mode 100644
index 00000000..b7c7ffd0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_ethernet_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_ethernet_white_24dp.png
new file mode 100644
index 00000000..b68e2923
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_ethernet_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
new file mode 100644
index 00000000..6b717e0d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_ethernet_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_ethernet_white_24dp.png
new file mode 100644
index 00000000..bc63ba5a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_ethernet_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
new file mode 100644
index 00000000..39641921
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_white_24dp.png
new file mode 100644
index 00000000..1c29bfe6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_white_24dp.png differ
diff --git a/app/src/main/res/drawable/circle_color_primary.xml b/app/src/main/res/drawable/circle_color_primary.xml
new file mode 100644
index 00000000..50194cc2
--- /dev/null
+++ b/app/src/main/res/drawable/circle_color_primary.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:innerRadius="0dp"
+       android:shape="ring"
+       android:thicknessRatio="2"
+       android:useLevel="false">
+    <solid android:color="@color/colorPrimary"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/floating_console_bg_bottom.xml b/app/src/main/res/drawable/floating_console_bg_bottom.xml
new file mode 100644
index 00000000..3ff8cadf
--- /dev/null
+++ b/app/src/main/res/drawable/floating_console_bg_bottom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#ddd2d3d5"/>
+
+    <corners android:radius="12dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/floating_console_bg_top.xml b/app/src/main/res/drawable/floating_console_bg_top.xml
new file mode 100644
index 00000000..7aee34aa
--- /dev/null
+++ b/app/src/main/res/drawable/floating_console_bg_top.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/colorPrimary"/>
+
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_move_cursor.png b/app/src/main/res/drawable/ic_move_cursor.png
new file mode 100644
index 00000000..c558d96a
Binary files /dev/null and b/app/src/main/res/drawable/ic_move_cursor.png differ
diff --git a/app/src/main/res/drawable/ic_resizer.png b/app/src/main/res/drawable/ic_resizer.png
index a2ed94d2..9150e644 100644
Binary files a/app/src/main/res/drawable/ic_resizer.png and b/app/src/main/res/drawable/ic_resizer.png differ
diff --git a/app/src/main/res/layout/dialog_update_info.xml b/app/src/main/res/layout/dialog_update_info.xml
new file mode 100644
index 00000000..a34ff141
--- /dev/null
+++ b/app/src/main/res/layout/dialog_update_info.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="24dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/issues"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:textColor="#d50000"
+            android:textSize="16sp"
+            tools:text="当前版本存在严重问题，请尽快更新"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/text_release_notes"
+            android:textColor="@android:color/primary_text_light"
+            android:textSize="18sp"/>
+
+        <com.stardust.widget.CommonMarkdownView
+            android:id="@+id/release_notes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/text_download_url"
+            android:textColor="@android:color/primary_text_light"
+            android:textSize="18sp"/>
+
+        <LinearLayout
+            android:id="@+id/downloads"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"/>
+
+        <LinearLayout
+            android:id="@+id/do_not_ask_again_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <CheckBox
+                android:id="@+id/do_not_ask_again"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_do_not_ask_again_for_this_version"
+                android:textColor="@android:color/secondary_text_light"
+                android:textSize="16sp"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_update_info_btn.xml b/app/src/main/res/layout/dialog_update_info_btn.xml
new file mode 100644
index 00000000..dbe47a12
--- /dev/null
+++ b/app/src/main/res/layout/dialog_update_info_btn.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="wrap_content"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:background="@drawable/md_btn_selector_ripple"
+        android:textColor="@color/colorAccent"
+        tools:text="酷安"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/floating_console_expand.xml b/app/src/main/res/layout/floating_console_expand.xml
new file mode 100644
index 00000000..53e000ac
--- /dev/null
+++ b/app/src/main/res/layout/floating_console_expand.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="12dp"
+        android:background="@drawable/floating_console_bg_bottom"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                app:title="@string/_app_name">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="right">
+
+                    <ImageView
+                        android:id="@+id/move_or_resize"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:padding="8dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_settings_ethernet_white_24dp"
+                        android:tint="@android:color/white"/>
+
+                    <ImageView
+                        android:id="@+id/close"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:padding="8dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_close_white_24dp"/>
+                </LinearLayout>
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <view
+            android:id="@+id/console"
+            class="com.stardust.scriptdroid.ui.console.ConsoleActivity$ConsoleView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:minHeight="200dp"/>
+    </LinearLayout>
+
+
+    <ImageView
+        android:id="@+id/resizer"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/circle_color_primary"
+        android:padding="6dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_resizer"
+        android:tint="@android:color/white"
+        android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/move_cursor"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/circle_color_primary"
+        android:padding="5dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_move_cursor"
+        android:tint="@android:color/white"
+        android:visibility="gone"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/floating_window_collapse.xml b/app/src/main/res/layout/floating_window_collapse.xml
index e384dc50..8004d3da 100644
--- a/app/src/main/res/layout/floating_window_collapse.xml
+++ b/app/src/main/res/layout/floating_window_collapse.xml
@@ -10,5 +10,5 @@
         android:layout_height="40dp"
         android:background="@drawable/circle"
         android:padding="5dp"
-        android:src="@drawable/ic_android_eat_js"/>
+        android:src="@drawable/ic_android_eat_js_100"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_help_side_menu.xml b/app/src/main/res/layout/fragment_help_side_menu.xml
new file mode 100644
index 00000000..b049be0e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_help_side_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/resizable_floaty_container.xml b/app/src/main/res/layout/resizable_floaty_container.xml
deleted file mode 100644
index 27aed620..00000000
--- a/app/src/main/res/layout/resizable_floaty_container.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-    <com.stardust.widget.ViewSwitcher
-        android:id="@+id/container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:layout_marginRight="12dp"/>
-
-    <ImageView
-        android:id="@+id/resizer"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/circle_with_border"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_resizer"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index 91d0934f..c7ab25e3 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -3,24 +3,21 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_redo"
-        android:icon="@drawable/ic_undo_white_48dp"
+        android:id="@+id/action_beautify"
         android:orderInCategory="100"
-        android:title="@string/text_undo"
-        app:showAsAction="ifRoom|withText"/>
+        android:title="@string/text_code_beautify"
+        app:showAsAction="never"/>
 
     <item
-        android:id="@+id/action_undo"
-        android:icon="@drawable/ic_redo_white_48dp"
+        android:id="@+id/action_help"
         android:orderInCategory="200"
-        android:title="@string/text_redo"
-        app:showAsAction="ifRoom|withText"/>
+        android:title="@string/text_help"
+        app:showAsAction="never"/>
 
     <item
-        android:id="@+id/action_save"
-        android:icon="@drawable/ic_save_white_48dp"
+        android:id="@+id/action_console"
         android:orderInCategory="300"
-        android:title="@string/text_save"
-        app:showAsAction="ifRoom|withText"/>
+        android:title="@string/text_console"
+        app:showAsAction="never"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c44c5003..0a34356a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -161,6 +161,9 @@
     <string name="text_checking_update">正在检查更新</string>
     <string name="text_new_version">新版本</string>
     <string name="text_is_latest_version">已经是最新版本</string>
+    <string name="text_version_too_old">版本过低</string>
+    <string name="warning_version_too_old">这个版本已经不能再使用了哦</string>
+    <string name="text_release_notes">更新日志</string>
     <string-array name="record_control_keys">
         <item>None</item>
         <item>Volume Up</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d11ec75..bc1ad476 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -199,6 +199,17 @@
     <string name="text_check_update_error">检查更新失败Orz</string>
     <string name="text_check_update">检查更新</string>
     <string name="text_is_latest_version">已经是最新版本</string>
+    <string name="text_version_too_old">版本过低</string>
+    <string name="warning_version_too_old">当然版本为公测版，显现和潜在的问题很多，不再适合继续使用，</string>
+    <string name="text_update">更新</string>
+    <string name="text_release_notes">更新日志</string>
+    <string name="text_download_url">下载地址</string>
+    <string name="text_directly_download">直接下载</string>
+    <string name="text_downloading">下载中</string>
+    <string name="text_download_failed">下载失败~请到应用商店下载</string>
+    <string name="text_do_not_ask_again_for_this_version">此版本不再提示</string>
+    <string name="text_code_beautify">格式化代码</string>
+    <string name="text_processing">处理中</string>
 
     <string-array name="record_control_keys">
         <item>无</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 23afb3e1..40d27705 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,4 +45,5 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
+
 </resources>
diff --git a/autojs/src/main/assets/javascript_engine_init.js b/autojs/src/main/assets/javascript_engine_init.js
index 8b026cb0..e83bc520 100644
--- a/autojs/src/main/assets/javascript_engine_init.js
+++ b/autojs/src/main/assets/javascript_engine_init.js
@@ -79,6 +79,9 @@ var clearConsole = function(){
 }
 
 var shell = function(cmd, root){
+    if(arguments.length == 1){
+        return new com.stardust.scriptdroid.tool.Shell(context, arguments[0] ? 1 : 0);
+    }
     root = root ? 1 : 0;
     return __runtime__.shell(cmd, root);
 }
@@ -145,23 +148,23 @@ var longClick = function(a, b, c, d){
 }
 
 
-var scrollUp = function(a, b, c, d){
+var scrollDown = function(a, b, c, d){
     if(arguments.length == 0)
-        return __runtime__.automator.scrollAllUp();
+        return __runtime__.automator.scrollMaxForward();
     if(arguments.length == 1 && typeof a === 'number')
-        return __runtime__.automator.scrollUp(a);
+        return __runtime__.automator.scrollForward(a);
     return performAction(function(target){
-        return __runtime__.automator.scrollUp(target);
+        return __runtime__.automator.scrollForward(target);
     }, arguments);
 }
 
-var scrollDown = function(a, b, c, d){
+var scrollUp = function(a, b, c, d){
      if(arguments.length == 0)
-        return __runtime__.automator.scrollAllDown();
+        return __runtime__.automator.scrollMaxBackward();
      if(arguments.length == 1 && typeof a === 'number')
-        return __runtime__.automator.scrollDown(a);
+        return __runtime__.automator.scrollBackward(a);
       return performAction(function(target){
-        return __runtime__.automator.scrollDown(target);
+        return __runtime__.automator.scrollBackward(target);
     }, arguments);
 }
 
@@ -180,18 +183,23 @@ var setClip = function(text){
 
 
 var Tap = function(x, y){
-    return shell("input tap " + x + " " + y, true).code == 1;
+    __runtime__.shellExecNotReturnResultWithRoot("input tap " + x + " " + y);
 }
 
 var Swipe = function(x1, y1, x2, y2, duration){
     if(arguments.length == 5){
-        return shell("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2 + " " + duration, true).code == 1;
+        __runtime__.shellExecNotReturnResultWithRoot("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2 + " " + duration);
+    }else{
+         __runtime__.shellExecNotReturnResultWithRoot("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2);
     }
-    return shell("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2, true).code == 1;
+}
+
+var Screencap = function(path){
+    __runtime__.shellExecNotReturnResultWithRoot("screencap -p " + path);
 }
 
 var KeyCode = function(keyCode){
-    return shell("input keyevent " + keyCode, true).code == 1;
+    __runtime__.shellExecNotReturnResultWithRoot("input keyevent " + keyCode);
 }
 
 var Home = function(){
@@ -243,7 +251,7 @@ var Camera = function(){
 }
 
 var Text = function(text){
-     return shell("input text " + text, true).code == 1;
+     __runtime__.shellExecNotReturnResultWithRoot("input text " + text);
 }
 
 var selector = function(){
@@ -290,7 +298,8 @@ var open = function(path, mode, encoding, bufferSize){
     }
 }
 
-__importClassOld__(com.stardust.autojs.runtime.api.Shell);
+
+//__importClassOld__(com.stardust.autojs.runtime.api.SlowShell);
 
 var newInjectableWebClient = function(){
     return new com.stardust.autojs.runtime.api.InjectableWebClient(org.mozilla.javascript.Context.getCurrentContext(), __this__);
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
index 6729a764..567fe4f5 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -8,6 +8,8 @@ import android.widget.Toast;
 import com.stardust.autojs.R;
 import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.rhino_android.AndroidClassLoader;
+import com.stardust.autojs.runtime.api.AbstractShell;
+import com.stardust.autojs.runtime.api.SlowShell;
 import com.stardust.autojs.runtime.simple_action.SimpleActionAutomator;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.runtime.api.Console;
@@ -49,6 +51,8 @@ public class ScriptRuntime {
     @JavascriptField
     public AccessibilityInfoProvider info;
 
+    private AbstractShell mRootShell;
+
     public ScriptRuntime(Context context, Console console, AccessibilityBridge accessibilityBridge) {
         mContext = context;
         mAccessibilityBridge = accessibilityBridge;
@@ -88,6 +92,15 @@ public class ScriptRuntime {
         });
     }
 
+
+    @JavascriptInterface
+    public void shellExecNotReturnResultWithRoot(String cmd){
+        if(mRootShell == null){
+            mRootShell = new SlowShell(true);
+        }
+        mRootShell.exec(cmd);
+    }
+
     @JavascriptInterface
     public Shell.CommandResult shell(String cmd, int root) {
         return Shell.execCommand(cmd, root != 0);
@@ -96,7 +109,7 @@ public class ScriptRuntime {
     @JavascriptInterface
     public UiSelector selector(JavaScriptEngine engine) {
         AccessibilityNodeInfoAllocator allocator = (AccessibilityNodeInfoAllocator) engine.getTag("allocator");
-        if(allocator == null){
+        if (allocator == null) {
             allocator = new AccessibilityNodeInfoAllocator();
             engine.setTag("allocator", allocator);
         }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java
similarity index 56%
rename from autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java
rename to autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java
index 8feb54d0..cc36b95d 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java
@@ -1,33 +1,29 @@
 package com.stardust.autojs.runtime.api;
 
 /**
- * Created by Stardust on 2017/3/7.
+ * Created by Stardust on 2017/4/24.
  */
 
-public class Shell extends com.stardust.util.Shell {
+public abstract class AbstractShell {
 
-    public Shell(boolean root) {
-        super(root);
+    public AbstractShell() {
+        this(false);
     }
 
-    public void Tap(int x, int y) {
-        execute("input tap " + x + " " + y);
+    public AbstractShell(boolean root) {
+        init(root ? "su" : "sh");
     }
 
-    public void Swipe(int x1, int y1, int x2, int y2) {
-        execute("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2);
-    }
+    protected abstract void init(String initialCommand);
 
-    public void Swipe(int x1, int y1, int x2, int y2, long duration) {
-        execute("input swipe " + x1 + " " + y1 + " " + x2 + " " + y2 + " " + duration);
-    }
+    public abstract void exec(String command);
 
     public void KeyCode(int keyCode) {
-        execute("input keyevent " + keyCode);
+        exec("input keyevent " + keyCode);
     }
 
     public void KeyCode(String keyCode) {
-        execute("input keyevent " + keyCode);
+        exec("input keyevent " + keyCode);
     }
 
     public void Home() {
@@ -79,7 +75,6 @@ public class Shell extends com.stardust.util.Shell {
     }
 
     public void Text(String text) {
-        execute("input text " + text);
+        exec("input text " + text);
     }
-
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/SlowShell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/SlowShell.java
new file mode 100644
index 00000000..eb113030
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/SlowShell.java
@@ -0,0 +1,28 @@
+package com.stardust.autojs.runtime.api;
+
+import com.stardust.util.Shell;
+
+/**
+ * Created by Stardust on 2017/3/7.
+ */
+
+public class SlowShell extends AbstractShell {
+
+    private Shell mShell;
+
+    public SlowShell(boolean root) {
+        super(root);
+    }
+
+    @Override
+    protected void init(String initialCommand) {
+        mShell = new Shell(initialCommand);
+    }
+
+    @Override
+    public void exec(String command) {
+        mShell.execute(command);
+    }
+
+
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/simple_action/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/runtime/simple_action/SimpleActionAutomator.java
index 5bbb84af..5b6f8ebb 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/simple_action/SimpleActionAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/simple_action/SimpleActionAutomator.java
@@ -24,6 +24,7 @@ import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
 
 public class SimpleActionAutomator {
 
+    @Deprecated
     private static class PerformGlobalActionCommand extends AccessibilityEventCommandHost.AbstractCommand {
 
         boolean result;
@@ -91,22 +92,22 @@ public class SimpleActionAutomator {
     }
 
     @JavascriptInterface
-    public boolean scrollUp(int i) {
+    public boolean scrollBackward(int i) {
         return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, i));
     }
 
     @JavascriptInterface
-    public boolean scrollDown(int i) {
+    public boolean scrollForward(int i) {
         return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, i));
     }
 
     @JavascriptInterface
-    public boolean scrollAllUp() {
+    public boolean scrollMaxBackward() {
         return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD));
     }
 
     @JavascriptInterface
-    public boolean scrollAllDown() {
+    public boolean scrollMaxForward() {
         return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD));
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java b/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java
new file mode 100644
index 00000000..8eafd267
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java
@@ -0,0 +1,91 @@
+package com.stardust.autojs.script;
+
+import android.content.Context;
+
+import com.stardust.autojs.rhino_android.RhinoAndroidHelper;
+import com.stardust.pio.PFile;
+import com.stardust.pio.UncheckedIOException;
+
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by Stardust on 2017/4/12.
+ */
+
+public class JsBeautifier {
+
+    public interface Callback {
+
+        void onSuccess(String beautifiedCode);
+
+        void onException(Exception e);
+    }
+
+    private Executor mExecutor = Executors.newSingleThreadExecutor();
+    private Context mContext;
+    private org.mozilla.javascript.Context mScriptContext;
+    private Function mJsBeautifyFunction;
+    private Scriptable mScriptable;
+    private final String mBeautifyJsPath;
+
+    public JsBeautifier(Context context, String beautifyJsPath) {
+        mContext = context;
+        mBeautifyJsPath = beautifyJsPath;
+    }
+
+    public void beautify(final String code, final Callback callback) {
+        mExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    prepareIfNeeded();
+                    Object beautifiedCode = mJsBeautifyFunction.call(mScriptContext, mScriptable, mScriptable, new Object[]{code});
+                    callback.onSuccess(beautifiedCode.toString());
+                } catch (Exception e) {
+                    callback.onException(e);
+                }
+            }
+
+        });
+    }
+
+    public void prepare() {
+        mExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    prepareIfNeeded();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+        });
+    }
+
+
+    private void prepareIfNeeded() {
+        if (mScriptContext != null)
+            return;
+        RhinoAndroidHelper helper = new RhinoAndroidHelper(mContext);
+        mScriptContext = helper.enterContext();
+        compile();
+    }
+
+    private void compile() {
+        try {
+            InputStream is = mContext.getAssets().open(mBeautifyJsPath);
+            mScriptable = mScriptContext.initSafeStandardObjects();
+            mJsBeautifyFunction = mScriptContext.compileFunction(mScriptable, PFile.read(is), "<js_beautify>", 1, null);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+}
diff --git a/common/src/main/java/com/stardust/net/AutoHttpURLConnection.java b/common/src/main/java/com/stardust/net/AutoHttpURLConnection.java
new file mode 100644
index 00000000..a3828847
--- /dev/null
+++ b/common/src/main/java/com/stardust/net/AutoHttpURLConnection.java
@@ -0,0 +1,62 @@
+package com.stardust.net;
+
+import com.stardust.pio.UncheckedIOException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Created by Stardust on 2017/4/10.
+ */
+
+public class AutoHttpURLConnection extends HttpURLConnection implements AutoCloseable {
+
+    private HttpURLConnection mHttpURLConnection;
+    private InputStream mInputStream;
+    private OutputStream mOutputStream;
+
+
+    public AutoHttpURLConnection(URL url) throws IOException {
+        super(url);
+        mHttpURLConnection = (HttpURLConnection) url.openConnection();
+        connect();
+    }
+
+    public AutoHttpURLConnection(String url) throws IOException {
+        this(new URL(url));
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        try {
+            mInputStream = super.getInputStream();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return mInputStream;
+    }
+
+    @Override
+    public void close() {
+        disconnect();
+    }
+
+    @Override
+    public void disconnect() {
+        mHttpURLConnection.disconnect();
+    }
+
+    @Override
+    public boolean usingProxy() {
+        return mHttpURLConnection.usingProxy();
+    }
+
+    @Override
+    public void connect() throws IOException {
+        mHttpURLConnection.connect();
+    }
+}
diff --git a/common/src/main/java/com/stardust/util/Callback.java b/common/src/main/java/com/stardust/util/Callback.java
new file mode 100644
index 00000000..d3d3941b
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/Callback.java
@@ -0,0 +1,10 @@
+package com.stardust.util;
+
+/**
+ * Created by Stardust on 2017/4/18.
+ */
+
+public interface Callback<T> {
+
+    void call(T t);
+}
diff --git a/common/src/main/java/com/stardust/util/DownloadTask.java b/common/src/main/java/com/stardust/util/DownloadTask.java
new file mode 100644
index 00000000..67747b93
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/DownloadTask.java
@@ -0,0 +1,107 @@
+package com.stardust.util;
+
+import android.os.AsyncTask;
+
+import com.stardust.net.AutoHttpURLConnection;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.Callable;
+
+/**
+ * Created by Stardust on 2017/4/10.
+ */
+
+public class DownloadTask extends AsyncTask<String, Integer, Boolean> {
+
+    public interface ProgressListener {
+        void publishProgress(int i);
+    }
+
+    public static class Download implements Callable<Boolean> {
+
+        private String mUrl;
+        private String mPath;
+        private ProgressListener mListener;
+        private volatile boolean mCanceled = false;
+
+        public Download(String url, String path, ProgressListener listener) {
+            mUrl = url;
+            mPath = path;
+            mListener = listener;
+        }
+
+        @Override
+        public Boolean call() throws IOException {
+            try (AutoHttpURLConnection connection = new AutoHttpURLConnection(mUrl)) {
+                if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                    return false;
+                }
+                int total = connection.getContentLength();
+                InputStream input = connection.getInputStream();
+                FileOutputStream output = new FileOutputStream(mPath);
+                return download(input, output, total);
+            } catch (Exception e) {
+                throw e;
+            }
+        }
+
+        public void cancel() {
+            mCanceled = true;
+        }
+
+        private boolean download(InputStream input, FileOutputStream output, int total) throws IOException {
+            byte buffer[] = new byte[8192];
+            long downloaded = 0;
+            int read;
+            while ((read = input.read(buffer)) != -1) {
+                if (mCanceled) {
+                    input.close();
+                    return false;
+                }
+                downloaded += read;
+                if (total > 0)
+                    publishProgress((int) (downloaded * 100 / total));
+                output.write(buffer, 0, read);
+            }
+            return true;
+        }
+
+        private void publishProgress(int i) {
+            if (mListener != null) {
+                mListener.publishProgress(i);
+            }
+        }
+    }
+
+    private Download mDownload;
+
+    @Override
+    protected Boolean doInBackground(String... params) {
+        mDownload = new Download(params[0], params[1], new ProgressListener() {
+            @Override
+            public void publishProgress(int i) {
+                DownloadTask.this.publishProgress(i);
+            }
+        });
+        try {
+            return mDownload.call();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            mDownload = null;
+        }
+    }
+
+    @Override
+    protected void onCancelled() {
+        super.onCancelled();
+        if (mDownload != null)
+            mDownload.cancel();
+    }
+}
diff --git a/common/src/main/java/com/stardust/util/IntentUtil.java b/common/src/main/java/com/stardust/util/IntentUtil.java
index d8cb3d41..1f77aecb 100644
--- a/common/src/main/java/com/stardust/util/IntentUtil.java
+++ b/common/src/main/java/com/stardust/util/IntentUtil.java
@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 
+import java.io.File;
+
 
 public class IntentUtil {
 
@@ -81,4 +83,11 @@ public class IntentUtil {
     public static boolean goToAppDetailSettings(Context context) {
         return goToAppDetailSettings(context, context.getPackageName());
     }
+
+    public static void installApk(Context context, String path) {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.fromFile(new File(path)), "application/vnd.android.package-archive");
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
 }
diff --git a/common/src/main/java/com/stardust/util/NetworkUtils.java b/common/src/main/java/com/stardust/util/NetworkUtils.java
new file mode 100644
index 00000000..2140c04b
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/NetworkUtils.java
@@ -0,0 +1,20 @@
+package com.stardust.util;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+/**
+ * Created by Stardust on 2017/4/9.
+ */
+
+public class NetworkUtils {
+
+    public static boolean isWifiAvailable(Context context) {
+        ConnectivityManager connectivityManager = (ConnectivityManager) context
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetInfo = connectivityManager.getActiveNetworkInfo();
+        return activeNetInfo != null
+                && activeNetInfo.getType() == ConnectivityManager.TYPE_WIFI;
+    }
+}
diff --git a/common/src/main/java/com/stardust/util/ScreenMetrics.java b/common/src/main/java/com/stardust/util/ScreenMetrics.java
new file mode 100644
index 00000000..490ca786
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/ScreenMetrics.java
@@ -0,0 +1,35 @@
+package com.stardust.util;
+
+import android.app.Activity;
+import android.util.DisplayMetrics;
+
+import com.stardust.pio.PFile;
+
+/**
+ * Created by Stardust on 2017/4/26.
+ */
+
+public class ScreenMetrics {
+
+    private static int screenHeight;
+    private static int screenWidth;
+    private static boolean initialized = false;
+
+    public static void initIfNeeded(Activity activity) {
+        if (!initialized) {
+            DisplayMetrics metrics = new DisplayMetrics();
+            activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+            screenHeight = metrics.heightPixels;
+            screenWidth = metrics.widthPixels;
+            initialized = true;
+        }
+    }
+
+    public static int getScreenHeight() {
+        return screenHeight;
+    }
+
+    public static int getScreenWidth() {
+        return screenWidth;
+    }
+}
diff --git a/common/src/main/java/com/stardust/util/Shell.java b/common/src/main/java/com/stardust/util/Shell.java
index c5799031..b51dd7e4 100644
--- a/common/src/main/java/com/stardust/util/Shell.java
+++ b/common/src/main/java/com/stardust/util/Shell.java
@@ -37,8 +37,12 @@ public class Shell {
     }
 
     public Shell(boolean root) {
+        this(root ? COMMAND_SU : COMMAND_SH);
+    }
+
+    public Shell(String initialCommand) {
         try {
-            mProcess = new ProcessBuilder(root ? COMMAND_SU : COMMAND_SH).redirectErrorStream(true).start();
+            mProcess = new ProcessBuilder(initialCommand).redirectErrorStream(true).start();
             mCommandOutputStream = new DataOutputStream(mProcess.getOutputStream());
             mSucceedReader = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
             mErrorReader = new BufferedReader(new InputStreamReader(mProcess.getErrorStream()));
diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java
index 45abae58..8443f958 100644
--- a/common/src/main/java/com/stardust/util/ViewUtil.java
+++ b/common/src/main/java/com/stardust/util/ViewUtil.java
@@ -1,7 +1,9 @@
 package com.stardust.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.support.annotation.IdRes;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
@@ -26,5 +28,17 @@ public class ViewUtil {
         return result;
     }
 
+    public static int getScreenHeight(Activity activity) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels;
+    }
+
+    public static int getScreenWidth(Activity activity) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.widthPixels;
+    }
+
 
 }
diff --git a/version.json b/version.json
index f886864c..895c40e7 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
-  "versionCode": 117,
-  "versionName": "2.0.7 Beta",
+  "versionCode": 118,
+  "versionName": "2.0.8 Alpha",
   "releaseNotes": "* 新增 任务管理\n* 新增 代码格式化\n* 新增 免root模拟home键, 电源键, 多任务键等\n* 新增 真正支持Takser调用(插件)\n* 新增 新建文件夹\n* 新增 支持代码模块化(CommonJS)\n* 新增 支持NodeJs的部分模块",
   "downloads" : [
     {