refactor(ui): refactor dynamic layout inflater

feat(ui):  xml one way data binding
feat(ui): label `list`

autojs/src/main/assets/init.js

@@ -52,6 +52,11 @@ runtime.init();
         },
         toString: function(o){
             return String(o);
+        },
+        eval: function(context, expr){
+            with(context){
+                return eval(expr);
+            }
         }
     });
 

autojs/src/main/assets/modules/__ui__.js

@@ -1,120 +1,212 @@
-module.exports = function(__runtime__, scope){
+module.exports = function (runtime, global) {
+
+    require("object-observe-lite.min")();
+    require("array-observe.min")();
+
+
     var ui = {};
     ui.__view_cache__ = {};
 
-    ui.layout = function(xml){
-        var view = __runtime__.ui.layoutInflater.inflate(activity, xml.toString());
+    ui.layout = function (xml) {
+        runtime.ui.layoutInflater.setContext(activity);
+        var view = runtime.ui.layoutInflater.inflate(xml.toString());
         ui.setContentView(view);
     }
 
-    ui.setContentView = function(view){
+    ui.setContentView = function (view) {
         ui.view = view;
         ui.__view_cache__ = {};
-        ui.run(function(){
+        ui.run(function () {
             activity.setContentView(view);
         });
     }
 
-    ui.findById = function(id){
-        if(!ui.view)
+    ui.findById = function (id) {
+        if (!ui.view)
             return null;
         var v = ui.findByStringId(ui.view.getChildAt(0), id);
-        if(v){
+        if (v) {
             v = decorate(v);
         }
         return v;
     }
 
-    ui.isUiThread = function(){
+    ui.isUiThread = function () {
         importClass(android.os.Looper);
         return Looper.myLooper() == Looper.getMainLooper();
     }
 
-    ui.run = function(action){
-        if(ui.isUiThread()){
+    ui.run = function (action) {
+        if (ui.isUiThread()) {
             return action();
         }
         var err = null;
         var result;
-        var disposable = scope.threads.disposable();
-        __runtime__.uiHandler.post(function(){
-            try{
+        var disposable = global.threads.disposable();
+        runtime.uiHandler.post(function () {
+            try {
                 result = action();
                 disposable.setAndNotify(true);
-            }catch(e){
+            } catch (e) {
                 err = e;
                 disposable.setAndNotify(true);
             }
         });
         disposable.blockedGet();
-        if(err){
+        if (err) {
             throw err;
         }
         return result;
     }
 
-    ui.post = function(action, delay){
+    ui.post = function (action, delay) {
         delay = delay || 0;
-        __runtime__.getUiHandler().postDelay(wrapUiAction(action), delay);
+        runtime.getUiHandler().postDelay(wrapUiAction(action), delay);
     }
 
-    ui.statusBarColor = function(color){
-        if(typeof(color) == 'string'){
+    ui.statusBarColor = function (color) {
+        if (typeof (color) == 'string') {
             color = android.graphics.Color.parseColor(color);
         }
-        if(android.os.Build.VERSION.SDK_INT >= 21){
-            ui.run(function(){
+        if (android.os.Build.VERSION.SDK_INT >= 21) {
+            ui.run(function () {
                 activity.getWindow().setStatusBarColor(color);
             });
         }
     }
 
-    ui.finish = function(){
-        ui.run(function(){
+    ui.finish = function () {
+        ui.run(function () {
             activity.finish();
         });
     }
 
-    ui.findByStringId = function(view, id){
+    ui.findByStringId = function (view, id) {
         return com.stardust.autojs.core.ui.JsViewHelper.findViewByStringId(view, id);
     }
 
-    function decorate(view){
-        var view = scope.events.__asEmitter__(Object.create(view));
+    runtime.ui.bindingContext = global;
+    runtime.ui.layoutInflater.setLayoutInflaterDelegate({
+        beforeConvertXml: function (xml) {
+            return null;
+        },
+        afterConvertXml: function (xml) {
+            return xml;
+        },
+        afterInflation: function (result, xml, parent) {
+            return result;
+        },
+        beforeInflation: function (xml, parent) {
+            return null;
+        },
+        beforeInflateView: function (node, parent, attachToParent) {
+            return null;
+        },
+        afterInflateView: function (view, node, parent, attachToParent) {
+            return view;
+        },
+        beforeCreateView: function (node, viewName, attrs) {
+            return null;
+        },
+        afterCreateView: function (view, node, viewName, attrs) {
+            if (view.getClass().getName() == "com.stardust.autojs.core.ui.widget.JsListView") {
+                initListView(view);
+            }
+            return view;
+        },
+        beforeApplyAttributes: function (view, inflater, attrs, parent) {
+            return false;
+        },
+        afterApplyAttributes: function (view, inflater, attrs, parent) {
+
+        },
+        beforeInflateChildren: function (inflater, node, parent) {
+            return false;
+        },
+        afterInflateChildren: function (inflater, node, parent) {
+
+        },
+        afterApplyPendingAttributesOfChildren: function (inflater, view) {
+
+        },
+        beforeApplyPendingAttributesOfChildren: function (inflater, view) {
+            return false;
+        },
+        beforeApplyAttribute: function (inflater, view, ns, attrName, value, parent, attrs) {
+            value = bind(value);
+            inflater.setAttr(view, ns, attrName, value, parent, attrs);
+            this.afterApplyAttribute(inflater, view, ns, attrName, value, parent, attrs);
+            return true;
+        },
+        afterApplyAttribute: function (inflater, view, ns, attrName, value, parent, attrs) {
+
+        }
+    });
+
+    function bind(value) {
+        var ctx = runtime.ui.bindingContext;
+        if (ctx == null)
+            return;
+        var i = -1;
+        while ((i = value.indexOf("{{", i + 1)) >= 0) {
+            var j = value.indexOf("}}", i + 1);
+            if (j < 0)
+                return value;
+            value = value.substring(0, i) + evalInContext(value.substring(i + 2, j), ctx) + value.substring(j + 2);
+            i = j + 1;
+        }
+        return value;
+    }
+
+    function evalInContext(expr, ctx) {
+        return global.__exitIfError__(function () {
+            log(ctx.toString());
+            with(ctx){
+                return eval(expr);
+            }
+        });
+       
+    }
+
+    function decorate(view) {
+        var view = global.events.__asEmitter__(Object.create(view));
+        if (view.getClass().getName() == "com.stardust.autojs.core.ui.widget.JsListView") {
+            view = decorateList(view);
+        }
         var gestureDetector = new android.view.GestureDetector(context, {
-            onDown: function(e){
+            onDown: function (e) {
                 e = wrapMotionEvent(e);
                 emit("touch_down", e, view);
                 return e.consumed;
             },
-            onShowPress: function(e){
+            onShowPress: function (e) {
                 e = wrapMotionEvent(e);
                 emit("show_press", e, view);
             },
-            onSingleTapUp: function(e){
-               e = wrapMotionEvent(e);
-               emit("single_tap", e, view);
-               return e.consumed;
+            onSingleTapUp: function (e) {
+                e = wrapMotionEvent(e);
+                emit("single_tap", e, view);
+                return e.consumed;
             },
-            onScroll: function(e1, e2, distanceX, distanceY){
-                 e1 = wrapMotionEvent(e1);
-                 e2 = wrapMotionEvent(e2);
-                 emit("scroll", e1, e2, distanceX, distanceY, view);
-                 return e1.consumed || e2.consumed;
+            onScroll: function (e1, e2, distanceX, distanceY) {
+                e1 = wrapMotionEvent(e1);
+                e2 = wrapMotionEvent(e2);
+                emit("scroll", e1, e2, distanceX, distanceY, view);
+                return e1.consumed || e2.consumed;
             },
-            onLongPress: function(e){
-                 e = wrapMotionEvent(e);
-                 emit("long_press", e, view);
+            onLongPress: function (e) {
+                e = wrapMotionEvent(e);
+                emit("long_press", e, view);
             },
-            onFling: function(e1, e2, velocityX, velocityY){
-                 e1 = wrapMotionEvent(e1);
-                 e2 = wrapMotionEvent(e2);
-                 emit("fling", e1, e2, velocityX, velocityY, view);
-                 return e1.consumed || e2.consumed;
+            onFling: function (e1, e2, velocityX, velocityY) {
+                e1 = wrapMotionEvent(e1);
+                e2 = wrapMotionEvent(e2);
+                emit("fling", e1, e2, velocityX, velocityY, view);
+                return e1.consumed || e2.consumed;
             }
         });
-        view.setOnTouchListener(function(v, event){
-            if(gestureDetector.onTouchEvent(event)){
+        view.setOnTouchListener(function (v, event) {
+            if (gestureDetector.onTouchEvent(event)) {
                 return true;
             }
             event = wrapMotionEvent(event);
@@ -122,106 +214,141 @@ module.exports = function(__runtime__, scope){
             emit("touch", event, view);
             return event.consumed;
         })
-        view.setOnLongClickListener(function(v){
+        view.setOnLongClickListener(function (v) {
             var event = {};
             event.consumed = false;
             emit("long_click", event, view);
             return event.consumed;
         });
-        view.setOnClickListener(function(v){
+        view.setOnClickListener(function (v) {
             emit("click", view);
         });
-        view.setOnKeyListener(function(v, keyCode, event){
+        view.setOnKeyListener(function (v, keyCode, event) {
             event = wrapMotionEvent(event);
             emit("key", keyCode, event, v);
             return event.consumed;
         });
-        if(typeof(view.setOnCheckedChangeListener) == 'function'){
-            view.setOnCheckedChangeListener(function(v, isChecked){
+        if (typeof (view.setOnCheckedChangeListener) == 'function') {
+            view.setOnCheckedChangeListener(function (v, isChecked) {
                 emit("check", isChecked, view);
             });
         }
-        view._id = function(id){
-            return ui.findByStringId(view, id);
+        view._id = function (id) {
+            return ui.findById(view, id);
         }
-        view.click = function(listener){
-            if(listener){
+        view.click = function (listener) {
+            if (listener) {
                 view.setOnClickListener(new android.view.View.OnClickListener(wrapUiAction(listener)));
-            }else{
+            } else {
                 view.performClick();
             }
         }
-        view.longClick = function(listener){
-            if(listener){
+        view.longClick = function (listener) {
+            if (listener) {
                 view.setOnLongClickListener(wrapUiAction(listener, false));
-            }else{
+            } else {
                 view.performLongClick();
             }
         }
-        function emit(){
+        function emit() {
             var args = arguments;
-            scope.__exitIfError__(function(){
+            global.__exitIfError__(function () {
                 //不支持使用apply的原因是rhino会把参数中的primitive变成object
                 functionApply(view.emit, args);
-               //view.emit.apply(view, args);
+                //view.emit.apply(view, args);
             });
         }
         return view;
     }
 
+
+
+    function initListView(list) {
+        list.setDataSourceAdapter({
+            getItemCount: function (data) {
+                return data.length;
+            },
+            getItem: function (data, i) {
+                return data[i];
+            },
+            setDataSource: function (data) {
+                var adapter = list.getAdapter();
+                Array.observe(data, function (changes) {
+                    changes.forEach(change => {
+                        if (change.type == 'splice') {
+                            if (change.removed && change.removed.length > 0) {
+                                adapter.notifyItemRangeRemoved(change.index, change.removed.length);
+                            }
+                            if (change.addedCount > 0) {
+                                adapter.notifyItemRangeInserted(change.index, change.addedCount);
+                            }
+                        } else if (change.type == 'update') {
+                            adapter.notifyItemChanged(parseInt(change.name));
+                        }
+                    });
+                });
+            }
+        });
+    }
+
+    function decorateList(list) {
+
+        return list;
+    }
+
     ui.__decorate__ = decorate;
 
-    function wrapUiAction(action, defReturnValue){
-        if(typeof(activity)  != 'undefined'){
-            return function(){return action();};
+    function wrapUiAction(action, defReturnValue) {
+        if (typeof (activity) != 'undefined') {
+            return function () { return action(); };
         }
-        return function(){
+        return function () {
             return __exitIfError__(action, defReturnValue);
         }
     }
 
-    function wrapMotionEvent(e){
+    function wrapMotionEvent(e) {
         e = Object.create(e);
         e.consumed = false;
         return e;
     }
 
-    function functionApply(func, args){
-        if(args.length == 0)
+    function functionApply(func, args) {
+        if (args.length == 0)
             return func();
-        if(args.length == 1)
+        if (args.length == 1)
             return func(args[0]);
-        if(args.length == 2)
+        if (args.length == 2)
             return func(args[0], args[1]);
-        if(args.length == 3)
+        if (args.length == 3)
             return func(args[0], args[1], args[2]);
-        if(args.length == 4)
+        if (args.length == 4)
             return func(args[0], args[1], args[2], args[3]);
-        if(args.length == 5)
+        if (args.length == 5)
             return func(args[0], args[1], args[2], args[3], args[4]);
-        if(args.length == 6)
+        if (args.length == 6)
             return func(args[0], args[1], args[2], args[3], args[4], args[5]);
         throw new Error("too many arguments: " + args.length);
     }
 
-    var proxy = __runtime__.ui;
+    var proxy = runtime.ui;
     proxy.__proxy__ = {
-        set: function(name, value){
+        set: function (name, value) {
             ui[name] = value;
         },
-        get: function(name) {
-           if(!ui[name] && ui.view){
-               var cacheView = ui.__view_cache__[name];
-               if(cacheView){
-                   return cacheView;
-               }
-               cacheView = ui.findById(name);
-               if(cacheView){
-                   ui.__view_cache__[name] = cacheView;
-                   return cacheView;
-               }
-           }
-           return ui[name];
+        get: function (name) {
+            if (!ui[name] && ui.view) {
+                var cache = ui.__view_cache__[name];
+                if (cache) {
+                    return cache;
+                }
+                cache = ui.findById(name);
+                if (cache) {
+                    ui.__view_cache__[name] = cache;
+                    return cache;
+                }
+            }
+            return ui[name];
         }
     };
 

autojs/src/main/assets/modules/array-observe.min.js

@@ -0,0 +1,3 @@
+module.exports = function(){
+    Object.observe&&!Array.observe&&function(t,e){"use strict";var n=t.getNotifier,r="performChange",i="_original",o="splice";var u={push:function h(t){var e=arguments,u=h[i].apply(this,e);n(this)[r](o,function(){return{index:u-e.length,addedCount:e.length,removed:[]}});return u},unshift:function d(t){var e=arguments,u=d[i].apply(this,e);n(this)[r](o,function(){return{index:0,addedCount:e.length,removed:[]}});return u},pop:function a(){var t=this.length,e=a[i].call(this);if(this.length!==t)n(this)[r](o,function(){return{index:this.length,addedCount:0,removed:[e]}},this);return e},shift:function l(){var t=this.length,e=l[i].call(this);if(this.length!==t)n(this)[r](o,function(){return{index:0,addedCount:0,removed:[e]}},this);return e},splice:function f(t,e){var u=arguments,s=f[i].apply(this,u);if(s.length||u.length>2)n(this)[r](o,function(){return{index:t,addedCount:u.length-2,removed:s}},this);return s}};for(var s in u){u[s][i]=e.prototype[s];e.prototype[s]=u[s]}e.observe=function(e,n){return t.observe(e,n,["add","update","delete",o])};e.unobserve=t.unobserve}(Object,Array);
+}

autojs/src/main/assets/modules/object-observe-lite.min.js

@@ -0,0 +1,3 @@
+module.exports = function(){
+    Object.observe||function(e,t,n,r){"use strict";var o,i,c=["add","update","delete","reconfigure","setPrototype","preventExtensions"],a=t.isArray||function(e){return function(t){return"[object Array]"===e.call(t)}}(e.prototype.toString),f=t.prototype.indexOf?t.indexOf||function(e,n,r){return t.prototype.indexOf.call(e,n,r)}:function(e,t,n){for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1},s=n.Map!==r&&Map.prototype.forEach?function(){return new Map}:function(){var e=[],t=[];return{size:0,has:function(t){return f(e,t)>-1},get:function(n){return t[f(e,n)]},set:function(n,r){var o=f(e,n);-1===o?(e.push(n),t.push(r),this.size++):t[o]=r},"delete":function(n){var r=f(e,n);r>-1&&(e.splice(r,1),t.splice(r,1),this.size--)},forEach:function(n){for(var r=0;r<e.length;r++)n.call(arguments[1],t[r],e[r],this)}}},u=e.getOwnPropertyNames?function(){var t=e.getOwnPropertyNames;try{arguments.callee}catch(n){var r=(t(f).join(" ")+" ").replace(/prototype |length |name /g,"").slice(0,-1).split(" ");r.length&&(t=function(t){var n=e.getOwnPropertyNames(t);if("function"==typeof t)for(var o,i=0;i<r.length;)(o=f(n,r[i++]))>-1&&n.splice(o,1);return n})}return t}():function(t){var n,r,o=[];if("hasOwnProperty"in t)for(n in t)t.hasOwnProperty(n)&&o.push(n);else{r=e.hasOwnProperty;for(n in t)r.call(t,n)&&o.push(n)}return a(t)&&o.push("length"),o},p=n.requestAnimationFrame||n.webkitRequestAnimationFrame||function(){var e=+new Date,t=e;return function(n){return setTimeout(function(){n((t=+new Date)-e)},17)}}(),l=function(e,t,n){var r=o.get(e);r?(v(r,e),g(e,r,t,n)):(r=h(e),g(e,r,t,n),1===o.size&&p(d))},h=function(e,t){for(var n=u(e),r=[],i=0,t={handlers:s(),properties:n,values:r,notifier:b(e,t)};i<n.length;)r[i]=e[n[i++]];return o.set(e,t),t},v=function(e,t,n){if(e.handlers.size){var r,o,i,c,a,s,p,l=e.values,h=0;for(r=e.properties.slice(),o=r.length,i=u(t);h<i.length;)a=i[h++],c=f(r,a),s=t[a],-1===c?(w(t,e,{name:a,type:"add",object:t},n),e.properties.push(a),l.push(s)):(p=l[c],r[c]=null,o--,(p===s?0===p&&1/p!==1/s:p===p||s===s)&&(w(t,e,{name:a,type:"update",object:t,oldValue:p},n),e.values[c]=s));for(h=r.length;o&&h--;)null!==r[h]&&(w(t,e,{name:r[h],type:"delete",object:t,oldValue:l[h]},n),e.properties.splice(h,1),e.values.splice(h,1),o--)}},d=function(){o.size&&(o.forEach(v),i.forEach(y),p(d))},y=function(e,t){var n=e.changeRecords;n.length&&(e.changeRecords=[],t(n))},b=function(e,t){return arguments.length<2&&(t=o.get(e)),t&&t.notifier||{notify:function(t){t.type;var n=o.get(e);if(n){var r,i={object:e};for(r in t)"object"!==r&&(i[r]=t[r]);w(e,n,i)}},performChange:function(t,n){if("string"!=typeof t)throw new TypeError("Invalid non-string changeType");if("function"!=typeof n)throw new TypeError("Cannot perform non-function");var i,c,a=o.get(e),f=arguments[2],s=f===r?n():n.call(f);if(a&&v(a,e,t),a&&s&&"object"==typeof s){c={object:e,type:t};for(i in s)"object"!==i&&"type"!==i&&(c[i]=s[i]);w(e,a,c)}}}},g=function(e,t,n,r){var o=i.get(n);o||i.set(n,o={observed:s(),changeRecords:[]}),o.observed.set(e,{acceptList:r.slice(),data:t}),t.handlers.set(n,o)},w=function(e,t,n,r){t.handlers.forEach(function(t){var o=t.observed.get(e).acceptList;("string"!=typeof r||-1===f(o,r))&&f(o,n.type)>-1&&t.changeRecords.push(n)})};o=s(),i=s(),e.observe=function(t,n,o){if(!t||"object"!=typeof t&&"function"!=typeof t)throw new TypeError("Object.observe cannot observe non-object");if("function"!=typeof n)throw new TypeError("Object.observe cannot deliver to non-function");if(e.isFrozen&&e.isFrozen(n))throw new TypeError("Object.observe cannot deliver to a frozen function object");if(o===r)o=c;else if(!o||"object"!=typeof o)throw new TypeError("Third argument to Object.observe must be an array of strings.");return l(t,n,o),t},e.unobserve=function(e,t){if(null===e||"object"!=typeof e&&"function"!=typeof e)throw new TypeError("Object.unobserve cannot unobserve non-object");if("function"!=typeof t)throw new TypeError("Object.unobserve cannot deliver to non-function");var n,r=i.get(t);return r&&(n=r.observed.get(e))&&(r.observed.forEach(function(e,t){v(e.data,t)}),p(function(){y(r,t)}),1===r.observed.size&&r.observed.has(e)?i["delete"](t):r.observed["delete"](e),1===n.data.handlers.size?o["delete"](e):n.data.handlers["delete"](t)),e},e.getNotifier=function(t){if(null===t||"object"!=typeof t&&"function"!=typeof t)throw new TypeError("Object.getNotifier cannot getNotifier non-object");return e.isFrozen&&e.isFrozen(t)?null:b(t)},e.deliverChangeRecords=function(e){if("function"!=typeof e)throw new TypeError("Object.deliverChangeRecords cannot deliver to non-function");var t=i.get(e);t&&(t.observed.forEach(function(e,t){v(e.data,t)}),y(t,e))}}(Object,Array,this);
+}