From 35955faba9d0df926a50a6ed9e4d16acc723d867 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 7 Nov 2017 13:49:37 +0800
Subject: [PATCH] update DynamicLayoutInflater to lastest version

---
 app/build.gradle                              |  6 +-
 .../main/assets/sample/界面/QQ打开聊天窗口.js |  2 +-
 .../assets/sample/界面/WannaCry(仅为娱乐).js  |  2 +-
 app/src/main/assets/sample/界面/图片.js       |  8 +++
 app/src/main/assets/sample/界面/登录界面.js   | 10 +--
 .../java/com/stardust/scriptdroid/App.java    | 64 +++++++++++++++++++
 .../ui/codegeneration/CodeGenerateDialog.java |  2 +-
 .../scriptdroid/ui/widget/AvatarView.java     |  1 -
 autojs/build.gradle                           |  4 +-
 .../codegeneration/ReadOnlyUiObject.java      |  4 +-
 .../autojs/core/ui/ConvertLayoutInflater.java | 37 +----------
 .../stardust/autojs/core/ui/JsViewHelper.java |  5 +-
 .../autojs/core/ui/xml/XmlConverter.java      |  2 +-
 build.gradle                                  |  1 +
 common/build.gradle                           |  2 +-
 15 files changed, 97 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/assets/sample/界面/图片.js

diff --git a/app/build.gradle b/app/build.gradle
index aeaf501c..86960cc8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
-def AAVersion = '4.2.0'
+def AAVersion = '4.3.1'
 
 android {
     compileSdkVersion 25
@@ -9,8 +9,8 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 219
-        versionName "3.0.0 Alpha19"
+        versionCode 221
+        versionName "3.0.0 Alpha21"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
diff --git a/app/src/main/assets/sample/界面/QQ打开聊天窗口.js b/app/src/main/assets/sample/界面/QQ打开聊天窗口.js
index c0ddd404..72d0ccdf 100644
--- a/app/src/main/assets/sample/界面/QQ打开聊天窗口.js
+++ b/app/src/main/assets/sample/界面/QQ打开聊天窗口.js
@@ -4,7 +4,7 @@ ui.statusBarColor("#03a9f4");
 
 ui.layout(
     <vertical>
-        <text w="*" h="56" bg="#03a9f4" paddingLeft="16" gravity="center_vertical" color="#fff" size="18sp">QQ打开聊天窗口</text>
+        <text w="*" h="56" bg="#03a9f4" paddingLeft="16" gravity="center_vertical" color="#ffffff" size="18sp">QQ打开聊天窗口</text>
         <vertical h="*" w="*" margin="16 50">
             <input id="qq" h="50" hint="请输入QQ号"/>
             <button id="ok" text="确定" />
diff --git a/app/src/main/assets/sample/界面/WannaCry(仅为娱乐).js b/app/src/main/assets/sample/界面/WannaCry(仅为娱乐).js
index 0d2fdc91..47052005 100644
--- a/app/src/main/assets/sample/界面/WannaCry(仅为娱乐).js
+++ b/app/src/main/assets/sample/界面/WannaCry(仅为娱乐).js
@@ -13,7 +13,7 @@ ui.layout(
     <frame background="#AA0000">
 	    <vertical align="top" paddingTop="5" margin="10">
 		    <text id="oops" color="#FFFFFF" gravity="center" size="20">Oops, your files have been encrypted!</text>
-		    <text id="text" bg="#FFFFFF" gravity="left" color="#000" size="15" marginTop="15" h="425"></text>
+		    <text id="text" bg="#FFFFFF" gravity="left" color="#000000" size="15" marginTop="15" h="425"></text>
 		    <button id="payment" text="Payment" margin="20 0 0 0"/>
 		    <button id="decrypt" text="Decrypt"/>
 	    </vertical>
diff --git a/app/src/main/assets/sample/界面/图片.js b/app/src/main/assets/sample/界面/图片.js
new file mode 100644
index 00000000..daeeb545
--- /dev/null
+++ b/app/src/main/assets/sample/界面/图片.js
@@ -0,0 +1,8 @@
+"ui";
+
+ui.layout(
+<frame>
+    <img src="http://www.autojs.org/assets/uploads/profile/3-profileavatar.png"
+        w="80" h="80" align="center"/>
+</frame>
+)
\ No newline at end of file
diff --git a/app/src/main/assets/sample/界面/登录界面.js b/app/src/main/assets/sample/界面/登录界面.js
index e2835844..29bf4c86 100644
--- a/app/src/main/assets/sample/界面/登录界面.js
+++ b/app/src/main/assets/sample/界面/登录界面.js
@@ -9,11 +9,11 @@ function showLoginUI(){
       <frame>
         <vertical h="auto" align="center" margin="0 50">
           <linear>
-             <text w="56" gravity="center" color="#111" size="16">用户名</text>
+             <text w="56" gravity="center" color="#111111" size="16">用户名</text>
              <input id="name" w="*" h="40"/>
           </linear>
           <linear>
-             <text w="56" gravity="center" color="#111" size="16">密码</text>
+             <text w="56" gravity="center" color="#111111" size="16">密码</text>
              <input id="password" w="*" h="40" inputType="password"/>
           </linear>
           <linear gravity="center">
@@ -36,15 +36,15 @@ function showRegisterUI(){
       <frame>
         <vertical h="auto" align="center" margin="0 50">
           <linear>
-             <text w="56" gravity="center" color="#111" size="16">用户名</text>
+             <text w="56" gravity="center" color="#111111" size="16">用户名</text>
              <input w="*" h="40"/>
           </linear>
           <linear>
-             <text w="56" gravity="center" color="#111" size="16">密码</text>
+             <text w="56" gravity="center" color="#111111" size="16">密码</text>
              <input w="*" h="40" inputType="password"/>
           </linear>
           <linear>
-             <text w="56" gravity="center" color="#111" size="16">邮箱</text>
+             <text w="56" gravity="center" color="#111111" size="16">邮箱</text>
              <input w="*" h="40" inputType="email"/>
           </linear>
           <linear gravity="center">
diff --git a/app/src/main/java/com/stardust/scriptdroid/App.java b/app/src/main/java/com/stardust/scriptdroid/App.java
index b27676dd..dd9a0837 100644
--- a/app/src/main/java/com/stardust/scriptdroid/App.java
+++ b/app/src/main/java/com/stardust/scriptdroid/App.java
@@ -1,12 +1,22 @@
 package com.stardust.scriptdroid;
 
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.support.multidex.MultiDexApplication;
+import android.view.View;
+import android.widget.ImageView;
 
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
 import com.flurry.android.FlurryAgent;
+import com.nickandjerry.dynamiclayoutinflator.lib.ImageLoader;
+import com.nickandjerry.dynamiclayoutinflator.lib.util.Drawables;
 import com.squareup.leakcanary.LeakCanary;
 import com.stardust.scriptdroid.autojs.AutoJs;
 import com.stardust.scriptdroid.autojs.key.GlobalKeyObserver;
 import com.stardust.scriptdroid.autojs.record.GlobalRecorder;
+import com.stardust.scriptdroid.network.GlideApp;
 import com.stardust.scriptdroid.tool.CrashHandler;
 import com.stardust.scriptdroid.tool.JsBeautifierFactory;
 import com.stardust.scriptdroid.ui.error.ErrorReportActivity;
@@ -63,8 +73,62 @@ public class App extends MultiDexApplication {
         JsBeautifierFactory.initJsBeautify(this, "js/jsbeautify.js");
         GlobalKeyObserver.getSingleton();
         GlobalRecorder.initSingleton(this);
+        setupDrawableImageLoader();
+
     }
 
+    private void setupDrawableImageLoader() {
+        Drawables.setImageLoader(new ImageLoader() {
+            @Override
+            public void loadInto(ImageView imageView, Uri uri) {
+                GlideApp.with(App.this)
+                        .load(uri)
+                        .into(imageView);
+            }
+
+            @Override
+            public void loadIntoBackground(View view, Uri uri) {
+                GlideApp.with(App.this)
+                        .load(uri)
+                        .into(new SimpleTarget<Drawable>() {
+                            @Override
+                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
+                                view.setBackground(resource);
+                            }
+                        });
+            }
+
+            @Override
+            public Drawable load(View view, Uri uri) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void load(View view, Uri uri, DrawableCallback drawableCallback) {
+                GlideApp.with(App.this)
+                        .load(uri)
+                        .into(new SimpleTarget<Drawable>() {
+                            @Override
+                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
+                                drawableCallback.onLoaded(resource);
+                            }
+                        });
+            }
+
+            @Override
+            public void load(View view, Uri uri, BitmapCallback bitmapCallback) {
+                GlideApp.with(App.this)
+                        .asBitmap()
+                        .load(uri)
+                        .into(new SimpleTarget<Bitmap>() {
+                            @Override
+                            public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
+                                bitmapCallback.onLoaded(resource);
+                            }
+                        });
+            }
+        });
+    }
 
 
     public UiHandler getUiHandler() {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
index ffdf9114..9028fc3d 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
@@ -193,7 +193,7 @@ public class CodeGenerateDialog extends ThemeColorMaterialDialogBuilder {
         @OnCheckedChanged(R.id.checkbox)
         void onCheckedChanged() {
             getChild().checked = checkBox.isChecked();
-            if (checkBox.isChecked() && getChild().group.titleRes != R.string.text_action)
+            if (checkBox.isChecked() && getChild().group.titleRes != R.string.text_options)
                 uncheckOthers(getParentAdapterPosition(), getChild());
         }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/widget/AvatarView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AvatarView.java
index ded4b63d..f1dc39b7 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/widget/AvatarView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AvatarView.java
@@ -18,7 +18,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.makeramen.roundedimageview.RoundedImageView;
-import com.nickandjerry.dynamiclayoutinflator.lib.DynamicLayoutInflator;
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.network.GlideApp;
 import com.stardust.scriptdroid.network.Glides;
diff --git a/autojs/build.gradle b/autojs/build.gradle
index ddc11a09..3c3f0825 100644
--- a/autojs/build.gradle
+++ b/autojs/build.gradle
@@ -40,7 +40,9 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.github.hyb1996:DynamicLayoutInflator:0.1'
+    compile('com.github.hyb1996:DynamicLayoutInflator:0.22', {
+        exclude group: 'com.android.support'
+    })
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'net.lingala.zip4j:zip4j:1.3.2'
     compile('com.afollestad.material-dialogs:core:0.9.2.3', {
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
index ec7e264b..119860f8 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
@@ -43,7 +43,7 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public String className() {
-        return mNodeInfo.className.toString();
+        return mNodeInfo.className;
     }
 
     @Override
@@ -53,7 +53,7 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public String packageName() {
-        return mNodeInfo.packageName.toString();
+        return mNodeInfo.packageName;
     }
 
     @Override
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/ConvertLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/ConvertLayoutInflater.java
index 7766828d..5289273e 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/ConvertLayoutInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/ConvertLayoutInflater.java
@@ -6,7 +6,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.nickandjerry.dynamiclayoutinflator.lib.DynamicLayoutInflator;
+import com.nickandjerry.dynamiclayoutinflator.lib.DynamicLayoutInflater;
+import com.nickandjerry.dynamiclayoutinflator.lib.util.Drawables;
 import com.stardust.autojs.core.ui.widget.JsFrameLayout;
 import com.stardust.autojs.core.ui.xml.XmlConverter;
 import com.stardust.util.MapEntries;
@@ -22,45 +23,13 @@ import java.util.Map;
 
 public class ConvertLayoutInflater implements JsLayoutInflater {
 
-    static {
-        DynamicLayoutInflator.createViewRunnables();
-        DynamicLayoutInflator.viewRunnables.put("inputType", new DynamicLayoutInflator.ViewParamRunnable() {
-
-            private final Map<String, Integer> mInputTypes = new MapEntries<String, Integer>()
-                    .entry("text", InputType.TYPE_CLASS_TEXT)
-                    .entry("number", InputType.TYPE_CLASS_NUMBER)
-                    .entry("phone", InputType.TYPE_CLASS_PHONE)
-                    .entry("datetime", InputType.TYPE_CLASS_DATETIME)
-                    .entry("password", InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT)
-                    .entry("email", InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS | InputType.TYPE_CLASS_TEXT)
-                    .entry("date", InputType.TYPE_DATETIME_VARIATION_DATE | InputType.TYPE_CLASS_DATETIME)
-                    .entry("time", InputType.TYPE_DATETIME_VARIATION_TIME | InputType.TYPE_CLASS_DATETIME)
-                    .map();
-
-            @Override
-            public void apply(View view, String value, ViewGroup parent, Map<String, String> attrs) {
-                if (!(view instanceof TextView))
-                    return;
-                TextView textView = (TextView) view;
-                String[] types = value.split("[|]");
-                int inputType = 0;
-                for (String type : types) {
-                    if (mInputTypes.containsKey(type)) {
-                        inputType |= mInputTypes.get(type);
-                    }
-                }
-                if (inputType != 0)
-                    textView.setInputType(inputType);
-            }
-        });
-    }
 
     @Override
     public View inflate(Context context, String xml) {
         try {
             String androidLayoutXml = XmlConverter.convertToAndroidLayout(xml);
             JsFrameLayout root = new JsFrameLayout(context);
-            DynamicLayoutInflator.inflate(context, androidLayoutXml, root);
+            new DynamicLayoutInflater(context).inflate(androidLayoutXml, root);
             return root;
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java b/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
index 3d07f45d..378ec717 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
@@ -7,7 +7,8 @@ import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.nickandjerry.dynamiclayoutinflator.lib.DynamicLayoutInflator;
+import com.nickandjerry.dynamiclayoutinflator.lib.util.Ids;
+
 
 /**
  * Created by Stardust on 2017/5/14.
@@ -17,7 +18,7 @@ public class JsViewHelper {
 
     @Nullable
     public static View findViewByStringId(View view, String id) {
-        View result = DynamicLayoutInflator.findViewByIdString(view, id);
+        View result = view.findViewById(Ids.getIdFromName(id));
         if (result != null)
             return result;
         if (!(view instanceof ViewGroup)) {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
index 2925b036..42ef4fd2 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
@@ -36,7 +36,7 @@ public class XmlConverter {
                     .map("button", JsButton.class.getName())
                     .map("text", JsTextView.class.getName())
                     .map("input", JsEditText.class.getName())
-                    .map("image", "ImageView")
+                    .map("img", "ImageView")
             );
 
     private static final AttributeHandler ATTRIBUTE_HANDLER = new AttributeHandler.AttrNameRouter()
diff --git a/build.gradle b/build.gradle
index a7f286b1..48440800 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@ allprojects {
         maven {
             url "https://jitpack.io"
         }
+        google()
     }
 }
 
diff --git a/common/build.gradle b/common/build.gradle
index e4de4dc3..6ecf72d3 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -26,6 +26,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-annotations:25.3.1'
+    compile 'com.android.support:support-annotations:25.4.0'
     compile 'com.github.hyb1996:settingscompat:1.1.5'
 }