diff --git a/wechat/src/main/java/com/derry/wechat/steps/TestAblStep2.java b/wechat/src/main/java/com/derry/wechat/steps/TestAblStep2.java index 29f97f4..f19c3b6 100644 --- a/wechat/src/main/java/com/derry/wechat/steps/TestAblStep2.java +++ b/wechat/src/main/java/com/derry/wechat/steps/TestAblStep2.java @@ -12,7 +12,6 @@ import com.derry.wechat.abllib.AblStepBase; import com.derry.wechat.abllib.AblStepHandler; import com.derry.wechat.abllib.AblSteps; import com.derry.wechat.abllib.utils.AblViewUtil; -import com.derry.wechat.weutil.WeData; /** @@ -22,10 +21,7 @@ import com.derry.wechat.weutil.WeData; public class TestAblStep2 extends AblStepBase { @Override public void onStep(int step, Message msg) { - int color = WeData.getColor(863,2046); - int red = Color.red(204); - int green = Color.green(204); - int blue = Color.blue(204); + switch (step){ case AblSteps.STEP_10: AblViewUtil.findAndPerformActionTextView("发现"); diff --git a/wechat/src/main/java/com/derry/wechat/weutil/WeData.java b/wechat/src/main/java/com/derry/wechat/weutil/WeData.java deleted file mode 100644 index 36ae228..0000000 --- a/wechat/src/main/java/com/derry/wechat/weutil/WeData.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.derry.wechat.weutil; - -import android.graphics.Bitmap; -import android.media.Image; -import android.media.ImageReader; -import android.util.Log; - -import java.nio.ByteBuffer; - -public class WeData { - static ImageReader reader; - private static Bitmap bitmap; - - public static int getColor(int x, int y) { - if (reader == null) { - Log.d("", "getColor: reader is null"); - return -1; - } - - Image image = reader.acquireLatestImage(); - - if (image == null) { - if (bitmap == null) { - Log.d("", "getColor: image is null"); - return -1; - } - return bitmap.getPixel(x, y); - } - int width = image.getWidth(); - int height = image.getHeight(); - final Image.Plane[] planes = image.getPlanes(); - final ByteBuffer buffer = planes[0].getBuffer(); - int pixelStride = planes[0].getPixelStride(); - int rowStride = planes[0].getRowStride(); - int rowPadding = rowStride - pixelStride * width; - if (bitmap == null) { - bitmap = Bitmap.createBitmap(width + rowPadding / pixelStride, height, Bitmap.Config.ARGB_8888); - } - bitmap.copyPixelsFromBuffer(buffer); - image.close(); - - return bitmap.getPixel(x, y); - } -}