修复 image wrapper多余release导致崩溃的问题

This commit is contained in:
hyb1996
2018-10-28 09:02:30 +08:00
parent 245d13c377
commit e4a92531c3
8 changed files with 24 additions and 18 deletions

View File

@@ -122,6 +122,20 @@ module.exports = function (__runtime__, scope) {
return matToImage(mat);
}
images.resize = function(img, size, interpolation) {
var mat = newMat();
interpolation = Imgproc["INTER_" + (interpolation || "LINEAR")];
Imgproc.resize(img.mat, mat, newSize(size), 0, 0, interpolation);
return matToImage(mat);
}
images.scale = function(img, fx, fy, interpolation) {
var mat = newMat();
interpolation = Imgproc["INTER_" + (interpolation || "LINEAR")];
Imgproc.resize(img.mat, mat, newSize([0, 0]), fx, fy, interpolation);
return matToImage(mat);
}
images.detectsColor = function (img, color, x, y, threshold, algorithm) {
color = parseColor(color);
algorithm = algorithm || "diff";

View File

@@ -156,12 +156,6 @@ public class ImageWrapper {
throw new IllegalStateException("image has been recycled");
}
@Override
protected void finalize() throws Throwable {
super.finalize();
recycle();
}
public ImageWrapper clone() {
ensureNotRecycled();
if (mBitmap == null) {

View File

@@ -9,6 +9,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
import org.opencv.android.InstallCallbackInterface;
import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Core;
import org.opencv.imgproc.Imgproc;

View File

@@ -350,6 +350,7 @@ public class TextViewInflater<V extends TextView> extends BaseViewInflater<V> {
case "textColor":
view.setTextColor(Colors.parse(view.getContext(), value));
break;
case "size":
case "textSize":
view.setTextSize(TypedValue.COMPLEX_UNIT_PX, Dimensions.parseToPixel(value, view));
break;

View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":434,"versionName":"4.0.4 Alpha5","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha5.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha5.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":435,"versionName":"4.0.4 Alpha6","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha6.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha6.apk","properties":{}}]

View File

@@ -13,9 +13,9 @@ public final class ResourceMonitor {
private static final String LOG_TAG = "ResourceMonitor";
private static final ConcurrentHashMap<Class<?>, SparseArray<UnclosedResourceException>> mResources;
private static final ConcurrentHashMap<Class<?>, SparseArray<UnclosedResourceException>> mResources = new ConcurrentHashMap<>();
private static Handler mHandler;
private static boolean mEnabled;
private static boolean mEnabled = false;
public static void onOpen(ResourceMonitor.Resource resource) {
if (!mEnabled) {
@@ -64,11 +64,6 @@ public final class ResourceMonitor {
}
}
static {
mResources = new ConcurrentHashMap<>();
mEnabled = BuildConfig.DEBUG;
}
public static boolean isEnabled() {
return mEnabled;
}

View File

@@ -26,8 +26,9 @@
android:label="inrt"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:label, android:allowBackup"
tools:ignore="GoogleAppIndexingWarning">
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:label, android:allowBackup">
<activity android:name=".LogActivity">
</activity>

View File

@@ -1,6 +1,6 @@
{
"appVersionCode": 434,
"appVersionName": "4.0.4 Alpha5",
"appVersionCode": 435,
"appVersionName": "4.0.4 Alpha6",
"target": 28,
"mini": 17,
"compile": 28,