CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-21 21:01:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(images): java.lang.IllegalArgumentException: x must be < bitmap.width() in images.findMultiColors()

Browse Source
This commit is contained in:
hyb1996 2018-04-11 17:11:15 +08:00
parent 8b82a294d7
commit 51fa9bde49
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditText.java
View File

@ -34,6 +34,7 @@ import android.view.Gravity;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.scriptdroid.ui.edit.theme.Theme;
import com.stardust.scriptdroid.ui.edit.theme.TokenMapping;
import com.stardust.util.ClipboardUtil;
import com.stardust.util.TextUtils;
import org.mozilla.javascript.Token;
@ -135,6 +136,14 @@ public class CodeEditText extends AppCompatEditText {
}
}
@Override
public boolean onTextContextMenuItem(int id) {
if (id == android.R.id.paste) {
ClipboardUtil.setClip(getContext(), ClipboardUtil.getClip(getContext()).toString());
}
return super.onTextContextMenuItem(id);
}
//该方法中内联了很多函数来提高效率 但是 这是必要的吗？？？
// 绘制文本着色
private void drawText(Canvas canvas) {

7
autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java
View File

@ -110,7 +110,12 @@ public class ColorFinder {
int y = points[i + 1];
int color = points[i + 2];
ColorDetector colorDetector = new ColorDetector.DifferenceDetector(color, threshold);
int c = image.pixel((int) (x + startingPoint.x), (int) (y + startingPoint.y));
x += startingPoint.x;
y += startingPoint.y;
if (x >= image.getWidth() || y >= image.getHeight()) {
return false;
}
int c = image.pixel(x, y);
if (!colorDetector.detectsColor(Color.red(c), Color.green(c), Color.blue(c))) {
return false;
}