diff --git a/appliaction_test/src/main/res/layout/activity_main.xml b/appliaction_test/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 0c2764e..0000000
--- a/appliaction_test/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/appliaction_test/.gitignore b/photoEditor_test/.gitignore
similarity index 100%
rename from appliaction_test/.gitignore
rename to photoEditor_test/.gitignore
diff --git a/appliaction_test/build.gradle b/photoEditor_test/build.gradle
similarity index 97%
rename from appliaction_test/build.gradle
rename to photoEditor_test/build.gradle
index 168fe1e..e969987 100644
--- a/appliaction_test/build.gradle
+++ b/photoEditor_test/build.gradle
@@ -45,6 +45,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation project(path: ':photo_editor')
+ implementation project(path: ':stinger_game')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/appliaction_test/proguard-rules.pro b/photoEditor_test/proguard-rules.pro
similarity index 100%
rename from appliaction_test/proguard-rules.pro
rename to photoEditor_test/proguard-rules.pro
diff --git a/appliaction_test/src/androidTest/java/com/echo/appliaction_test/ExampleInstrumentedTest.java b/photoEditor_test/src/androidTest/java/com/echo/appliaction_test/ExampleInstrumentedTest.java
similarity index 100%
rename from appliaction_test/src/androidTest/java/com/echo/appliaction_test/ExampleInstrumentedTest.java
rename to photoEditor_test/src/androidTest/java/com/echo/appliaction_test/ExampleInstrumentedTest.java
diff --git a/appliaction_test/src/main/AndroidManifest.xml b/photoEditor_test/src/main/AndroidManifest.xml
similarity index 85%
rename from appliaction_test/src/main/AndroidManifest.xml
rename to photoEditor_test/src/main/AndroidManifest.xml
index a665fa3..e809b8d 100644
--- a/appliaction_test/src/main/AndroidManifest.xml
+++ b/photoEditor_test/src/main/AndroidManifest.xml
@@ -21,6 +21,10 @@
+
+
\ No newline at end of file
diff --git a/photoEditor_test/src/main/java/com/echo/appliaction_test/Image_information_activity.java b/photoEditor_test/src/main/java/com/echo/appliaction_test/Image_information_activity.java
new file mode 100644
index 0000000..6a654c8
--- /dev/null
+++ b/photoEditor_test/src/main/java/com/echo/appliaction_test/Image_information_activity.java
@@ -0,0 +1,111 @@
+package com.echo.appliaction_test;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.echo.appliaction_test.databinding.ImageInformationBinding;
+
+import org.tensorflow.lite.support.image.TensorImage;
+
+import java.util.Arrays;
+
+/**
+ * @Author: WangYuyang
+ * @Date: 2021/10/31-14:53
+ * @Project: My Application
+ * @Package: com.echo.appliaction_test
+ * @Description:
+ **/
+public class Image_information_activity extends AppCompatActivity {
+ private ImageInformationBinding binding;
+ private Image_information_activity _this = this;
+ private String sourceFilePath;
+ private Bitmap image;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ binding = ImageInformationBinding.inflate(getLayoutInflater());
+ setContentView(binding.getRoot());
+
+ Intent intent = getIntent();
+ sourceFilePath = intent.getStringExtra("sourceFilePath");
+ image = BitmapFactory.decodeFile(sourceFilePath);
+ TensorImage Timage = TensorImage.fromBitmap(image);
+
+ binding.imageView2.setImageBitmap(image);
+ TextView information = new TextView(this);
+ information.append("getHeight: " + image.getHeight());
+ information.append("\n");
+ information.append("getWidth: " + image.getWidth());
+ information.append("\n");
+ information.append("describeContents: " + image.describeContents());
+ information.append("\n");
+ information.append("getRowBytes: " + image.getRowBytes());
+ information.append("\n");
+ information.append("hasAlpha: " + image.hasAlpha());
+ information.append("\n");
+ information.append("hasMipMap: " + image.hasMipMap());
+ information.append("\n");
+ information.append("isPremultiplied: " + image.isPremultiplied());
+ information.append("\n");
+ information.append("isMutable: " + image.isMutable());
+ information.append("\n");
+ information.append("isRecycled: " + image.isRecycled());
+ information.append("\n");
+ information.append("toString: " + image.toString());
+ information.append("\n");
+ information.append("getAllocationByteCount: " + image.getAllocationByteCount());
+ information.append("\n");
+ information.append("getByteCount: " + image.getByteCount());
+ information.append("\n");
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ information.append("getColorSpace: " + image.getColorSpace());
+ }
+ information.append("\n");
+ information.append("getConfig: " + image.getConfig());
+ information.append("\n");
+ information.append("getDensity: " + image.getDensity());
+ information.append("\n");
+ information.append("getGenerationId: " + image.getGenerationId());
+ information.append("\n");
+ information.append("-----------------Tensor---------------------");
+ information.append("\n");
+ information.append("getDataType: " + Timage.getDataType());
+ information.append("\n");
+ information.append("getDataType.byteSize: " + Timage.getDataType().byteSize());
+ information.append("\n");
+ information.append("toString: " + Timage.toString());
+ information.append("\n");
+ information.append("getFlatSize: " + Timage.getTensorBuffer().getFlatSize());
+ information.append("\n");
+ information.append("getShape: " + Arrays.toString(Timage.getTensorBuffer().getShape()));
+ information.append("\n");
+ information.append("getTypeSize: " + Timage.getTensorBuffer().getTypeSize());
+ information.append("\n");
+ information.append("isDynamic: " + Timage.getTensorBuffer().isDynamic());
+ information.append("\n");
+ if (Timage.getTensorBuffer().getFlatSize() < 10000000) {
+ information.append("getIntArray length: " + Timage.getTensorBuffer().getIntArray().length);
+ information.append("\n");
+ int[] array;
+ if (Timage.getTensorBuffer().getIntArray().length > 200)
+ array = Arrays.copyOfRange(Timage.getTensorBuffer().getIntArray(), 0, 200);
+ else
+ array = Timage.getTensorBuffer().getIntArray();
+ information.append("getIntArray(0..200): " + Arrays.toString(array));
+ }
+
+
+ binding.informationArea.addView(information);
+
+
+ }
+}
diff --git a/appliaction_test/src/main/java/com/echo/appliaction_test/MainActivity.java b/photoEditor_test/src/main/java/com/echo/appliaction_test/MainActivity.java
similarity index 51%
rename from appliaction_test/src/main/java/com/echo/appliaction_test/MainActivity.java
rename to photoEditor_test/src/main/java/com/echo/appliaction_test/MainActivity.java
index f3003d8..21feb98 100644
--- a/appliaction_test/src/main/java/com/echo/appliaction_test/MainActivity.java
+++ b/photoEditor_test/src/main/java/com/echo/appliaction_test/MainActivity.java
@@ -1,18 +1,17 @@
package com.echo.appliaction_test;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.view.View;
+import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.echo.appliaction_test.databinding.ActivityMainBinding;
import com.echo.photo_editor.photo_editor_view.PhotoEditorView;
import com.echo.photo_editor.thirdparty.GlideEngine;
+import com.echo.stinger_game.myganme.GameActivity;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
@@ -21,7 +20,9 @@ import com.luck.picture.lib.listener.OnResultCallbackListener;
import org.tensorflow.lite.support.image.TensorImage;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Random;
@@ -40,6 +41,33 @@ public class MainActivity extends AppCompatActivity {
// intent.putExtra("sourceFilePath", sourceFilePath);
// startActivity(intent);
setContentView(binding.getRoot());
+ TextView textView = binding.textView2;
+ TextView textView1 = binding.textView3;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SS");// HH:mm:ss
+ Date date = new Date(System.currentTimeMillis());
+ textView1.setText(simpleDateFormat.format(date));
+ textView.setText(String.valueOf(System.currentTimeMillis()));
+ } catch (Exception e) {
+
+ }
+ }
+ });
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ return;
+ }
+ }
+ }
+ }).start();
binding.ChooseImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -53,42 +81,37 @@ public class MainActivity extends AppCompatActivity {
public void onResult(List result) {
sourceFilePath = result.get(0).getRealPath();
- Bitmap img = BitmapFactory.decodeFile(sourceFilePath);
-
- if (!check_is_grayscale(img)) {
- final AlertDialog.Builder alterDialog = new AlertDialog.Builder(_this);
-
- alterDialog.setTitle("Is this a grayscale image ?");//文字
- alterDialog.setMessage("We think the image you choose is not a grayscale image, are you sure you want to upload ?");//提示消息
- alterDialog.setPositiveButton("YES", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(_this, PhotoEditorView.class);
- intent.putExtra("sourceFilePath", sourceFilePath);
- startActivity(intent);
- }
- });
-
- alterDialog.setNegativeButton("NO", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
-
- }
- });
- alterDialog.show();
- } else {
-// System.out.println(img.describeContents());
-// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-// System.out.println(img.getColorSpace());
-// }
-// TensorImage tensorImage = TensorImage.fromBitmap(img);
-// System.out.println(Arrays.toString(tensorImage.getTensorBuffer().getShape()));
-// System.out.println(Arrays.toString(tensorImage.getTensorBuffer().getIntArray()));
-// System.out.println(tensorImage.getTensorBuffer().getIntArray().length);
- Intent intent = new Intent(_this, PhotoEditorView.class);
- intent.putExtra("sourceFilePath", sourceFilePath);
- startActivity(intent);
- }
+// Bitmap img = BitmapFactory.decodeFile(sourceFilePath);
+ Intent intent = new Intent(_this, PhotoEditorView.class);
+ intent.putExtra("sourceFilePath", sourceFilePath);
+ startActivity(intent);
+
+ }
+
+ @Override
+ public void onCancel() {
+ // 取消
+ }
+ });
+ }
+ });
+ binding.ImageInformationButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ PictureSelector.create(_this)
+ .openGallery(PictureMimeType.ofAll())
+ .imageEngine(GlideEngine.createGlideEngine())
+ .selectionMode(PictureConfig.SINGLE)
+ .forResult(new OnResultCallbackListener() {
+ @Override
+ public void onResult(List result) {
+
+ sourceFilePath = result.get(0).getRealPath();
+// Bitmap img = BitmapFactory.decodeFile(sourceFilePath);
+ Intent intent = new Intent(_this, Image_information_activity.class);
+ intent.putExtra("sourceFilePath", sourceFilePath);
+ startActivity(intent);
+
}
@Override
@@ -98,6 +121,17 @@ public class MainActivity extends AppCompatActivity {
});
}
});
+
+
+ binding.gameButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(_this, GameActivity.class);
+ startActivity(intent);
+ }
+ });
+
+
}
public static Boolean check_is_grayscale(Bitmap img) {
diff --git a/appliaction_test/src/main/res/drawable-v24/ic_launcher_foreground.xml b/photoEditor_test/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from appliaction_test/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to photoEditor_test/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/appliaction_test/src/main/res/drawable/ic_launcher_background.xml b/photoEditor_test/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from appliaction_test/src/main/res/drawable/ic_launcher_background.xml
rename to photoEditor_test/src/main/res/drawable/ic_launcher_background.xml
diff --git a/photoEditor_test/src/main/res/font/abeezee.ttf b/photoEditor_test/src/main/res/font/abeezee.ttf
new file mode 100644
index 0000000..9eae6f2
Binary files /dev/null and b/photoEditor_test/src/main/res/font/abeezee.ttf differ
diff --git a/photoEditor_test/src/main/res/layout/activity_main.xml b/photoEditor_test/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..e4dac61
--- /dev/null
+++ b/photoEditor_test/src/main/res/layout/activity_main.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/photoEditor_test/src/main/res/layout/image_information.xml b/photoEditor_test/src/main/res/layout/image_information.xml
new file mode 100644
index 0000000..a504ebb
--- /dev/null
+++ b/photoEditor_test/src/main/res/layout/image_information.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/appliaction_test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/photoEditor_test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to photoEditor_test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/appliaction_test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/photoEditor_test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to photoEditor_test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/appliaction_test/src/main/res/mipmap-hdpi/ic_launcher.webp b/photoEditor_test/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to photoEditor_test/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/appliaction_test/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/photoEditor_test/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to photoEditor_test/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/appliaction_test/src/main/res/mipmap-mdpi/ic_launcher.webp b/photoEditor_test/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to photoEditor_test/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/appliaction_test/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/photoEditor_test/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to photoEditor_test/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/appliaction_test/src/main/res/mipmap-xhdpi/ic_launcher.webp b/photoEditor_test/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to photoEditor_test/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/appliaction_test/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/photoEditor_test/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to photoEditor_test/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/appliaction_test/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/photoEditor_test/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to photoEditor_test/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/appliaction_test/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/photoEditor_test/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to photoEditor_test/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/appliaction_test/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/photoEditor_test/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to photoEditor_test/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/appliaction_test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/photoEditor_test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from appliaction_test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to photoEditor_test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/appliaction_test/src/main/res/values-night/themes.xml b/photoEditor_test/src/main/res/values-night/themes.xml
similarity index 100%
rename from appliaction_test/src/main/res/values-night/themes.xml
rename to photoEditor_test/src/main/res/values-night/themes.xml
diff --git a/appliaction_test/src/main/res/values/colors.xml b/photoEditor_test/src/main/res/values/colors.xml
similarity index 100%
rename from appliaction_test/src/main/res/values/colors.xml
rename to photoEditor_test/src/main/res/values/colors.xml
diff --git a/appliaction_test/src/main/res/values/strings.xml b/photoEditor_test/src/main/res/values/strings.xml
similarity index 100%
rename from appliaction_test/src/main/res/values/strings.xml
rename to photoEditor_test/src/main/res/values/strings.xml
diff --git a/appliaction_test/src/main/res/values/themes.xml b/photoEditor_test/src/main/res/values/themes.xml
similarity index 100%
rename from appliaction_test/src/main/res/values/themes.xml
rename to photoEditor_test/src/main/res/values/themes.xml
diff --git a/appliaction_test/src/test/java/com/echo/appliaction_test/ExampleUnitTest.java b/photoEditor_test/src/test/java/com/echo/appliaction_test/ExampleUnitTest.java
similarity index 100%
rename from appliaction_test/src/test/java/com/echo/appliaction_test/ExampleUnitTest.java
rename to photoEditor_test/src/test/java/com/echo/appliaction_test/ExampleUnitTest.java
diff --git a/settings.gradle b/settings.gradle
index b79f7e9..6111f02 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,4 +11,4 @@ rootProject.name = "My Application"
include ':app'
include ':photo_editor'
include ':stinger_game'
-include ':appliaction_test'
+include ':photoEditor_test'