diff --git a/app/src/androidTest/java/com/echo/colorizeit/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/echo/colorizeit/ExampleInstrumentedTest.java index 769539b..2c12163 100644 --- a/app/src/androidTest/java/com/echo/colorizeit/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/echo/colorizeit/ExampleInstrumentedTest.java @@ -11,9 +11,8 @@ import org.junit.runner.RunWith; import static org.junit.Assert.*; /** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 */ @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { diff --git a/app/src/main/java/com/echo/colorizeit/APP.java b/app/src/main/java/com/echo/colorizeit/APP.java index dfa8b9d..4327e29 100644 --- a/app/src/main/java/com/echo/colorizeit/APP.java +++ b/app/src/main/java/com/echo/colorizeit/APP.java @@ -5,6 +5,10 @@ import android.app.Application; import cn.leancloud.LCLogger; import cn.leancloud.LeanCloud; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class APP extends Application { @Override public void onCreate() { diff --git a/app/src/main/java/com/echo/colorizeit/BaiduAPI/BaiduImageAPI.java b/app/src/main/java/com/echo/colorizeit/BaiduAPI/BaiduImageAPI.java index ba9aed9..893b37c 100644 --- a/app/src/main/java/com/echo/colorizeit/BaiduAPI/BaiduImageAPI.java +++ b/app/src/main/java/com/echo/colorizeit/BaiduAPI/BaiduImageAPI.java @@ -10,6 +10,12 @@ import org.json.JSONObject; import java.util.HashMap; + + +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class BaiduImageAPI { //设置APPID/AK/SK public static final String APP_ID = "24778510"; diff --git a/app/src/main/java/com/echo/colorizeit/BaiduAPI/styleTransTypes.java b/app/src/main/java/com/echo/colorizeit/BaiduAPI/styleTransTypes.java index cc21ad0..822c21f 100644 --- a/app/src/main/java/com/echo/colorizeit/BaiduAPI/styleTransTypes.java +++ b/app/src/main/java/com/echo/colorizeit/BaiduAPI/styleTransTypes.java @@ -1,5 +1,10 @@ package com.echo.colorizeit.BaiduAPI; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ + public enum styleTransTypes { cartoon, pencil, @@ -10,4 +15,5 @@ public enum styleTransTypes { mononoke, scream, gothic + } diff --git a/app/src/main/java/com/echo/colorizeit/ImageUtil/PhotoLib.java b/app/src/main/java/com/echo/colorizeit/ImageUtil/PhotoLib.java index c8d89b7..644c492 100644 --- a/app/src/main/java/com/echo/colorizeit/ImageUtil/PhotoLib.java +++ b/app/src/main/java/com/echo/colorizeit/ImageUtil/PhotoLib.java @@ -14,6 +14,10 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class PhotoLib { public static byte[] BitmapToBytes(Bitmap img){ int bytes = img.getByteCount(); diff --git a/app/src/main/java/com/echo/colorizeit/ImageUtil/rcImage.java b/app/src/main/java/com/echo/colorizeit/ImageUtil/rcImage.java index 3fc1c0b..a34ac43 100644 --- a/app/src/main/java/com/echo/colorizeit/ImageUtil/rcImage.java +++ b/app/src/main/java/com/echo/colorizeit/ImageUtil/rcImage.java @@ -1,5 +1,9 @@ package com.echo.colorizeit.ImageUtil; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class rcImage { private String imgName; private String imgBase64Data; diff --git a/app/src/main/java/com/echo/colorizeit/ImageUtil/GlideEngine.java b/app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/GlideEngine.java similarity index 98% rename from app/src/main/java/com/echo/colorizeit/ImageUtil/GlideEngine.java rename to app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/GlideEngine.java index bfd226e..55984ef 100644 --- a/app/src/main/java/com/echo/colorizeit/ImageUtil/GlideEngine.java +++ b/app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/GlideEngine.java @@ -1,4 +1,4 @@ -package com.echo.colorizeit.ImageUtil; +package com.echo.colorizeit.ImageUtil.thirdparty; import android.content.Context; import android.graphics.Bitmap; @@ -24,6 +24,7 @@ import com.luck.picture.lib.widget.longimage.ImageViewState; import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView; /** + * ==================This is a imported class================ * @author：luck * @date：2019-11-13 17:02 * @describe：Glide加载引擎 diff --git a/photo_editor/src/main/java/com/echo/photo_editor/ImageLoaderUtils.java b/app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/ImageLoaderUtils.java similarity index 89% rename from photo_editor/src/main/java/com/echo/photo_editor/ImageLoaderUtils.java rename to app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/ImageLoaderUtils.java index 5a3c52b..8bccb5d 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/ImageLoaderUtils.java +++ b/app/src/main/java/com/echo/colorizeit/ImageUtil/thirdparty/ImageLoaderUtils.java @@ -1,10 +1,11 @@ -package com.echo.photo_editor; +package com.echo.colorizeit.ImageUtil.thirdparty; import android.app.Activity; import android.content.Context; import android.content.ContextWrapper; /** + * ==================This is a imported class================ * @author：luck * @date：2021/7/14 3:15 PM * @describe：ImageLoaderUtils diff --git a/app/src/main/java/com/echo/colorizeit/Interfaces/RequestsListener.java b/app/src/main/java/com/echo/colorizeit/Interfaces/RequestsListener.java index 5a72005..a9d47e2 100644 --- a/app/src/main/java/com/echo/colorizeit/Interfaces/RequestsListener.java +++ b/app/src/main/java/com/echo/colorizeit/Interfaces/RequestsListener.java @@ -1,5 +1,9 @@ package com.echo.colorizeit.Interfaces; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public interface RequestsListener { void success(String data); void failure(String info); diff --git a/app/src/main/java/com/echo/colorizeit/ML/MLModel.java b/app/src/main/java/com/echo/colorizeit/ML/MLModel.java deleted file mode 100644 index ea2027e..0000000 --- a/app/src/main/java/com/echo/colorizeit/ML/MLModel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.echo.colorizeit.ML; - -public interface MLModel { - void process(String path, ProcessListener listener); -} diff --git a/app/src/main/java/com/echo/colorizeit/ML/ProcessListener.java b/app/src/main/java/com/echo/colorizeit/ML/ProcessListener.java deleted file mode 100644 index fc44c97..0000000 --- a/app/src/main/java/com/echo/colorizeit/ML/ProcessListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.echo.colorizeit.ML; - -import android.graphics.Bitmap; - -public interface ProcessListener { - void success(String data); - void failure(String info); - void success(Bitmap FinishedBitmap); -} diff --git a/app/src/main/java/com/echo/colorizeit/ML/StyleTransModel.java b/app/src/main/java/com/echo/colorizeit/ML/StyleTransModel.java deleted file mode 100644 index 41d431c..0000000 --- a/app/src/main/java/com/echo/colorizeit/ML/StyleTransModel.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.echo.colorizeit.ML; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; - -import com.example.myapplication.ml.MagentaArbitraryImageStylizationV1256Fp16Prediction1; -import com.example.myapplication.ml.MagentaArbitraryImageStylizationV1256Fp16Transfer1; - -import org.tensorflow.lite.support.image.TensorImage; -import org.tensorflow.lite.support.tensorbuffer.TensorBuffer; - -import java.io.IOException; - -public class StyleTransModel implements MLModel{ - private Context context; - - public StyleTransModel(Context context) { - this.context = context; - } - - @Override - public void process(String path, ProcessListener listener) { - new Thread(new Runnable() { - @Override - public void run() { - Bitmap bitmap = BitmapFactory.decodeFile(path); - //Style Prediction - try { - MagentaArbitraryImageStylizationV1256Fp16Prediction1 model1 = MagentaArbitraryImageStylizationV1256Fp16Prediction1.newInstance(context); - // Creates inputs for reference. - TensorImage styleImage = TensorImage.fromBitmap(bitmap); - // Runs model inference and gets result. - MagentaArbitraryImageStylizationV1256Fp16Prediction1.Outputs outputs1 = model1.process(styleImage); - TensorBuffer styleBottleneck = outputs1.getStyleBottleneckAsTensorBuffer(); - // Releases model resources if no longer used. - model1.close(); - - MagentaArbitraryImageStylizationV1256Fp16Transfer1 model2 = MagentaArbitraryImageStylizationV1256Fp16Transfer1.newInstance(context); - - // Creates inputs for reference. - TensorImage contentImage = TensorImage.fromBitmap(bitmap); - // Runs model inference and gets result. - MagentaArbitraryImageStylizationV1256Fp16Transfer1.Outputs outputs2 = model2.process(contentImage, styleBottleneck); - TensorImage styledImage = outputs2.getStyledImageAsTensorImage(); - Bitmap styledImageBitmap = styledImage.getBitmap(); - // Releases model resources if no longer used. - model2.close(); - listener.success(styledImageBitmap); -// listener.success(SerializeUtil.serialize(styledImageBitmap)); - } catch (IOException e) { - // TODO Handle the exception - } - } - }).start(); - - } -} diff --git a/app/src/main/java/com/echo/colorizeit/MainActivity.java b/app/src/main/java/com/echo/colorizeit/MainActivity.java index c0f3ede..591f56f 100644 --- a/app/src/main/java/com/echo/colorizeit/MainActivity.java +++ b/app/src/main/java/com/echo/colorizeit/MainActivity.java @@ -35,6 +35,10 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class MainActivity extends AppCompatActivity { private AppBarConfiguration mAppBarConfiguration; diff --git a/app/src/main/java/com/echo/colorizeit/Util.java b/app/src/main/java/com/echo/colorizeit/Util.java index 7060617..5d71eb4 100644 --- a/app/src/main/java/com/echo/colorizeit/Util.java +++ b/app/src/main/java/com/echo/colorizeit/Util.java @@ -15,6 +15,10 @@ import cn.leancloud.LCUser; import io.reactivex.disposables.Disposable; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class Util { public static List getFilesAllName(String path) { File file=new File(path); diff --git a/app/src/main/java/com/echo/colorizeit/ui/BaseActivity.java b/app/src/main/java/com/echo/colorizeit/ui/BaseActivity.java index af75537..8238aee 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/BaseActivity.java +++ b/app/src/main/java/com/echo/colorizeit/ui/BaseActivity.java @@ -9,6 +9,10 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.android.material.snackbar.Snackbar; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class BaseActivity extends AppCompatActivity { public static final int READ_WRITE_STORAGE = 52; private ProgressDialog mProgressDialog; diff --git a/app/src/main/java/com/echo/colorizeit/ui/BaseFragment.java b/app/src/main/java/com/echo/colorizeit/ui/BaseFragment.java index 8292031..44ba16c 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/BaseFragment.java +++ b/app/src/main/java/com/echo/colorizeit/ui/BaseFragment.java @@ -9,6 +9,10 @@ import androidx.fragment.app.Fragment; import com.google.android.material.snackbar.Snackbar; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class BaseFragment extends Fragment { public static final int READ_WRITE_STORAGE = 52; private ProgressDialog mProgressDialog; diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_camera_activity/CameraKitActivity.java b/app/src/main/java/com/echo/colorizeit/ui/a_camera_activity/CameraKitActivity.java index d0584ef..2cb6f5d 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_camera_activity/CameraKitActivity.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_camera_activity/CameraKitActivity.java @@ -8,6 +8,10 @@ import com.camerakit.CameraKitView; import com.example.myapplication.databinding.CamerakitViewBinding; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class CameraKitActivity extends AppCompatActivity { private CamerakitViewBinding binding; diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadActivityViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadActivityViewModel.java index 78217c4..8ca7586 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadActivityViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadActivityViewModel.java @@ -10,6 +10,10 @@ import com.echo.colorizeit.BaiduAPI.BaiduImageAPI; import com.echo.colorizeit.ImageUtil.PhotoLib; import com.echo.colorizeit.Interfaces.RequestsListener; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class ImageUploadActivityViewModel extends ViewModel { private BaiduImageAPI baiduImageAPI; private String imagePath; diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadViewActivity.java b/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadViewActivity.java index 983c2b8..4fdc7b3 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadViewActivity.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadViewActivity.java @@ -31,6 +31,10 @@ import com.example.myapplication.databinding.ImageColorizeUploadActivityBinding; import ch.halcyon.squareprogressbar.utils.PercentStyle; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class ImageUploadViewActivity extends BaseActivity { private AppBarConfiguration mAppBarConfiguration; private ImageColorizeUploadActivityBinding binding; diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java index b83a81e..98dcc79 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java @@ -25,6 +25,10 @@ import com.echo.colorizeit.ui.BaseActivity; import com.example.myapplication.R; import com.example.myapplication.databinding.OpenScreenBinding; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class OpenScreenActivity extends BaseActivity { private OpenScreenBinding binding; private Activity _this = this; diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java index 9da37c5..43fda2b 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java @@ -12,6 +12,11 @@ import cn.leancloud.LCUser; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ + public class OpenScreenViewModel extends ViewModel { private MutableLiveData setting; private MutableLiveData Is_user_first_enter_this_app; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java b/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java index 04d6a40..e39e1f0 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java @@ -16,11 +16,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; - -import com.echo.colorizeit.ML.ProcessListener; -import com.echo.colorizeit.ML.StyleTransModel; import com.echo.colorizeit.ui.BaseFragment; -import com.echo.colorizeit.ImageUtil.GlideEngine; +import com.echo.colorizeit.ImageUtil.thirdparty.GlideEngine; import com.example.myapplication.R; import com.example.myapplication.databinding.FragmentImageColorizeBinding; @@ -33,6 +30,10 @@ import com.luck.picture.lib.listener.OnResultCallbackListener; import java.util.List; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class ImageProcessTESTFragment extends BaseFragment { private ImageProcessTESTViewModel model; @@ -40,7 +41,6 @@ public class ImageProcessTESTFragment extends BaseFragment { private ImageProcessTESTFragment _this = this; private String sourceFilePath; - private StyleTransModel styleTransModel; // private ActivityResultLauncher requestPermission = registerForActivityResult(new ActivityResultContracts.RequestPermission(), new ActivityResultCallback() { // @Override @@ -57,7 +57,7 @@ public class ImageProcessTESTFragment extends BaseFragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - styleTransModel = new StyleTransModel(getContext()); +// styleTransModel = new StyleTransModel(getContext()); // superResolutionModel = new SuperResolutionModel(getContext()); model = new ViewModelProvider(this).get(ImageProcessTESTViewModel.class); @@ -139,21 +139,21 @@ public class ImageProcessTESTFragment extends BaseFragment { // imageColorizeViewModel.setColorizedImageBitmap(styledImageBitmap); // } // }); - styleTransModel.process(sourceFilePath, new ProcessListener() { - @Override - public void success(String data) { - hideLoading(); - } - @Override - public void failure(String info) { - hideLoading(); - } - @Override - public void success(Bitmap styledImageBitmap) { - model.setColorizedImageBitmap(styledImageBitmap); - hideLoading(); - } - }); +// styleTransModel.process(sourceFilePath, new ProcessListener() { +// @Override +// public void success(String data) { +// hideLoading(); +// } +// @Override +// public void failure(String info) { +// hideLoading(); +// } +// @Override +// public void success(Bitmap styledImageBitmap) { +// model.setColorizedImageBitmap(styledImageBitmap); +// hideLoading(); +// } +// }); } }); diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java index 2cdd447..65c025f 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java @@ -6,6 +6,10 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class ImageProcessTESTViewModel extends ViewModel { private MutableLiveData mText; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryFragment.java b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryFragment.java index aaa4f58..ab92531 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryFragment.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryFragment.java @@ -26,6 +26,10 @@ import java.util.ArrayList; import java.util.List; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class GalleryFragment extends BaseFragment { private GalleryViewModel model; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryViewModel.java index ed01624..530a70b 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/GalleryViewModel.java @@ -4,6 +4,10 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class GalleryViewModel extends ViewModel { private MutableLiveData mText; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/ImageAdapter.java b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/ImageAdapter.java index 1d89b35..933e8a5 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/ImageAdapter.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/ImageAdapter.java @@ -17,6 +17,10 @@ import com.example.myapplication.R; import java.util.List; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class ImageAdapter extends RecyclerView.Adapter { private List imageList; public ImageAdapter(List list) { diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageFragment.java b/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageFragment.java index a2c8e53..c2a6aca 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageFragment.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageFragment.java @@ -26,7 +26,7 @@ import androidx.annotation.Nullable; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.echo.colorizeit.ImageUtil.GlideEngine; +import com.echo.colorizeit.ImageUtil.thirdparty.GlideEngine; import com.echo.colorizeit.Util; import com.echo.stinger_game.myganme.GameActivity; import com.echo.colorizeit.ui.BaseFragment; @@ -43,6 +43,10 @@ import com.sdsmdg.harjot.rotatingtext.RotatingTextWrapper; import java.util.List; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class MainIndexPageFragment extends BaseFragment { private static final int REQUEST_IMAGE_CAPTURE = 1; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageViewModel.java index c1909e7..c7caa7e 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageViewModel.java @@ -13,6 +13,10 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class MainIndexPageViewModel extends ViewModel { private MutableLiveData mText; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragment.java b/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragment.java index dc4f1b6..13003c7 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragment.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragment.java @@ -19,6 +19,10 @@ import cn.leancloud.LCObject; import cn.leancloud.LCUser; import io.reactivex.disposables.Disposable; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class UserFragment extends Fragment { private UserFragmentViewModel model; private FragmentUserBinding binding; diff --git a/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragmentViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragmentViewModel.java index 37fae38..6f8abdb 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragmentViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/f_user_view/UserFragmentViewModel.java @@ -7,6 +7,10 @@ import cn.leancloud.LCObject; import cn.leancloud.LCUser; import io.reactivex.disposables.Disposable; +/** + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 + */ public class UserFragmentViewModel extends ViewModel { private MutableLiveData balance; private MutableLiveData processedCount; diff --git a/app/src/main/java/com/echo/colorizeit/ui/v_others/ResizableImageView.java b/app/src/main/java/com/echo/colorizeit/ui/v_others/ResizableImageView.java index 56bf5e5..f84d9e9 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/v_others/ResizableImageView.java +++ b/app/src/main/java/com/echo/colorizeit/ui/v_others/ResizableImageView.java @@ -5,7 +5,8 @@ import android.graphics.drawable.Drawable; import android.util.AttributeSet; /** - * Created by onkar_nene on 02-02-2016. + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 */ public class ResizableImageView extends androidx.appcompat.widget.AppCompatImageView { public ResizableImageView(Context context, AttributeSet attributeSet) { diff --git a/app/src/main/ml/ESRGAN.tflite b/app/src/main/ml/ESRGAN.tflite deleted file mode 100644 index 68bbf7c..0000000 Binary files a/app/src/main/ml/ESRGAN.tflite and /dev/null differ diff --git a/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_prediction_1.tflite b/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_prediction_1.tflite deleted file mode 100644 index 165b689..0000000 Binary files a/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_prediction_1.tflite and /dev/null differ diff --git a/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_transfer_1.tflite b/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_transfer_1.tflite deleted file mode 100644 index e165950..0000000 Binary files a/app/src/main/ml/magenta_arbitrary-image-stylization-v1-256_fp16_transfer_1.tflite and /dev/null differ diff --git a/app/src/test/java/com/echo/colorizeit/ExampleUnitTest.java b/app/src/test/java/com/echo/colorizeit/ExampleUnitTest.java index 7da0ea7..832b986 100644 --- a/app/src/test/java/com/echo/colorizeit/ExampleUnitTest.java +++ b/app/src/test/java/com/echo/colorizeit/ExampleUnitTest.java @@ -5,9 +5,8 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation + * @author Wang Yuyang + * @date 2021-09-22 13:52:43 */ public class ExampleUnitTest { @Test diff --git a/photo_editor/build.gradle b/photo_editor/build.gradle index 607b6a1..5190325 100644 --- a/photo_editor/build.gradle +++ b/photo_editor/build.gradle @@ -6,7 +6,7 @@ android { compileSdk 30 defaultConfig { -// applicationId "com.echo.photo_editor" + applicationId "com.echo.photo_editor" minSdk 21 targetSdk 30 versionCode 1 diff --git a/photo_editor/src/androidTest/java/com/echo/photo_editor/ExampleInstrumentedTest.java b/photo_editor/src/androidTest/java/com/echo/photo_editor/ExampleInstrumentedTest.java index 52ff1e4..e6779d0 100644 --- a/photo_editor/src/androidTest/java/com/echo/photo_editor/ExampleInstrumentedTest.java +++ b/photo_editor/src/androidTest/java/com/echo/photo_editor/ExampleInstrumentedTest.java @@ -11,9 +11,8 @@ import org.junit.runner.RunWith; import static org.junit.Assert.*; /** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation + * @author WangYuyang + * @date 2021-10-30 15:56:43 */ @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { diff --git a/photo_editor/src/main/AndroidManifest.xml b/photo_editor/src/main/AndroidManifest.xml index 25520e6..e81684b 100644 --- a/photo_editor/src/main/AndroidManifest.xml +++ b/photo_editor/src/main/AndroidManifest.xml @@ -26,11 +26,11 @@ - - + + - - + + diff --git a/photo_editor/src/main/java/com/echo/photo_editor/ML/MLModel.java b/photo_editor/src/main/java/com/echo/photo_editor/ML/MLModel.java index 6cc4f89..c7526da 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/ML/MLModel.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/ML/MLModel.java @@ -2,6 +2,10 @@ package com.echo.photo_editor.ML; import android.graphics.Bitmap; +/** + * @author WangYuyang + * @date 2021-09-22 13:54:24 + */ public interface MLModel { void process(String path, ProcessListener listener); void process(Bitmap img_style, Bitmap img_to_be_process, ProcessListener listener); diff --git a/photo_editor/src/main/java/com/echo/photo_editor/ML/ProcessListener.java b/photo_editor/src/main/java/com/echo/photo_editor/ML/ProcessListener.java index a8bc9dc..0713f8c 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/ML/ProcessListener.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/ML/ProcessListener.java @@ -2,6 +2,10 @@ package com.echo.photo_editor.ML; import android.graphics.Bitmap; +/** + * @author WangYuyang + * @date 2021-09-22 13:54:24 + */ public interface ProcessListener { void start(); void success(Bitmap FinishedBitmap); diff --git a/photo_editor/src/main/java/com/echo/photo_editor/ML/StyleTransModel.java b/photo_editor/src/main/java/com/echo/photo_editor/ML/StyleTransModel.java index 1056125..a14c277 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/ML/StyleTransModel.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/ML/StyleTransModel.java @@ -13,6 +13,10 @@ import org.tensorflow.lite.support.tensorbuffer.TensorBuffer; import java.io.IOException; +/** + * @author WangYuyang + * @date 2021-09-22 13:54:24 + */ public class StyleTransModel implements MLModel { private Context context; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/MainActivity.java b/photo_editor/src/main/java/com/echo/photo_editor/MainActivity.java index 3fc2757..dbb27a3 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/MainActivity.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/MainActivity.java @@ -8,6 +8,7 @@ import android.view.View; import com.echo.photo_editor.databinding.ActivityMainBinding; import com.echo.photo_editor.photo_editor_view.PhotoEditorView; +import com.echo.photo_editor.thirdparty.GlideEngine; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -16,6 +17,10 @@ import com.luck.picture.lib.listener.OnResultCallbackListener; import java.util.List; +/** + * @author WangYuyang + * @date 2021-10-30 15:56:43 + */ public class MainActivity extends AppCompatActivity { private ActivityMainBinding binding; private MainActivity _this = this; @@ -25,6 +30,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = ActivityMainBinding.inflate(getLayoutInflater()); + //-----------------------------TEST Image------------------------------- sourceFilePath = "/storage/emulated/0/Pictures/Colorized Image (26).jpg"; Intent intent = new Intent(_this, PhotoEditorView.class); intent.putExtra("sourceFilePath", sourceFilePath); diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorView.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorView.java index 8db93cd..f6d391d 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorView.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorView.java @@ -27,6 +27,10 @@ import com.echo.photo_editor.photo_editor_view.model.Toolbox; import java.util.ArrayList; +/** + * @author WangYuyang + * @date 2021-10-29 12:33:11 + */ public class PhotoEditorView extends AppCompatActivity { public PhotoEditorViewModel model; private ActivityPhotoEditorBinding binding; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorViewModel.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorViewModel.java index 6e98013..1c2f8db 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorViewModel.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/PhotoEditorViewModel.java @@ -11,6 +11,10 @@ import com.echo.photo_editor.photo_editor_view.model.EditableImage; import java.util.ArrayList; +/** + * @author WangYuyang + * @date 2021-10-29 12:34:44 + */ public class PhotoEditorViewModel extends ViewModel { private MutableLiveData sourceFilePath = new MutableLiveData<>(""); private CustomMutableLiveData editableImage = new CustomMutableLiveData<>(); diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/adapter/ImagePreviewAdapter.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/adapter/ImagePreviewAdapter.java index c378b43..7bf86b3 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/adapter/ImagePreviewAdapter.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/adapter/ImagePreviewAdapter.java @@ -17,6 +17,10 @@ import com.echo.photo_editor.photo_editor_view.model.Toolbox; import java.util.ArrayList; +/** + * @author WangYuyang + * @date 2021-10-29 13:12:05 + */ public class ImagePreviewAdapter extends RecyclerView.Adapter { private Boolean isShowing_tool = false; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/CustomMutableLiveData.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/CustomMutableLiveData.java index 9d544dc..e66d613 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/CustomMutableLiveData.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/CustomMutableLiveData.java @@ -4,6 +4,10 @@ import androidx.databinding.BaseObservable; import androidx.databinding.Observable; import androidx.lifecycle.MutableLiveData; +/** + * @author WangYuyang + * @date 2021-10-30 15:23:14 + */ public class CustomMutableLiveData extends MutableLiveData { diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/EditableImage.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/EditableImage.java index e41981e..f14bfad 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/EditableImage.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/EditableImage.java @@ -11,6 +11,10 @@ import java.util.ArrayList; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; +/** + * @author WangYuyang + * @date 2021-10-30 14:07:24 + */ public class EditableImage extends BaseObservable { private Bitmap current_bitmap; private Bitmap source_bitmap; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/StyleTool.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/StyleTool.java index e1bd67b..2311394 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/StyleTool.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/StyleTool.java @@ -7,6 +7,10 @@ import android.view.View; import com.echo.photo_editor.ML.ProcessListener; import com.echo.photo_editor.photo_editor_view.PhotoEditorView; +/** + * @author WangYuyang + * @date 2021-10-29 22:51:42 + */ public class StyleTool extends Tool { public Bitmap style_image; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Tool.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Tool.java index 944f9d7..eeb0822 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Tool.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Tool.java @@ -3,6 +3,10 @@ package com.echo.photo_editor.photo_editor_view.model; import android.graphics.Bitmap; import android.view.View; +/** + * @author WangYuyang + * @date 2021-10-29 20:19:41 + */ public class Tool implements ToolBarItem { public String name; public Bitmap image; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/ToolBarItem.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/ToolBarItem.java index 537d907..85bdf2e 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/ToolBarItem.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/ToolBarItem.java @@ -2,6 +2,10 @@ package com.echo.photo_editor.photo_editor_view.model; import android.graphics.Bitmap; +/** + * @author WangYuyang + * @date 2021-10-29 20:49:42 + */ public interface ToolBarItem { String getName(); Bitmap getImage(); diff --git a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Toolbox.java b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Toolbox.java index 86bfd63..ab8eb48 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Toolbox.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/photo_editor_view/model/Toolbox.java @@ -4,6 +4,10 @@ import android.graphics.Bitmap; import java.util.ArrayList; +/** + * @author WangYuyang + * @date 2021-10-29 13:14:48 + */ public class Toolbox implements ToolBarItem{ public String name; public Bitmap image; diff --git a/photo_editor/src/main/java/com/echo/photo_editor/GlideEngine.java b/photo_editor/src/main/java/com/echo/photo_editor/thirdparty/GlideEngine.java similarity index 98% rename from photo_editor/src/main/java/com/echo/photo_editor/GlideEngine.java rename to photo_editor/src/main/java/com/echo/photo_editor/thirdparty/GlideEngine.java index 7293053..9f31f20 100644 --- a/photo_editor/src/main/java/com/echo/photo_editor/GlideEngine.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/thirdparty/GlideEngine.java @@ -1,4 +1,4 @@ -package com.echo.photo_editor; +package com.echo.photo_editor.thirdparty; import android.content.Context; import android.graphics.Bitmap; @@ -15,6 +15,7 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.BitmapImageViewTarget; import com.bumptech.glide.request.target.ImageViewTarget; +import com.echo.photo_editor.R; import com.luck.picture.lib.engine.ImageEngine; import com.luck.picture.lib.listener.OnImageCompleteCallback; import com.luck.picture.lib.tools.MediaUtils; @@ -23,6 +24,7 @@ import com.luck.picture.lib.widget.longimage.ImageViewState; import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView; /** + * ==================This is a imported class================ * @author：luck * @date：2019-11-13 17:02 * @describe：Glide加载引擎 diff --git a/app/src/main/java/com/echo/colorizeit/ImageUtil/ImageLoaderUtils.java b/photo_editor/src/main/java/com/echo/photo_editor/thirdparty/ImageLoaderUtils.java similarity index 84% rename from app/src/main/java/com/echo/colorizeit/ImageUtil/ImageLoaderUtils.java rename to photo_editor/src/main/java/com/echo/photo_editor/thirdparty/ImageLoaderUtils.java index c00bf2f..9c05a06 100644 --- a/app/src/main/java/com/echo/colorizeit/ImageUtil/ImageLoaderUtils.java +++ b/photo_editor/src/main/java/com/echo/photo_editor/thirdparty/ImageLoaderUtils.java @@ -1,13 +1,14 @@ -package com.echo.colorizeit.ImageUtil; +package com.echo.photo_editor.thirdparty; import android.app.Activity; import android.content.Context; import android.content.ContextWrapper; /** + * ==================This is a imported class================ * @author：luck - * @date：2021/7/14 3:15 PM - * @describe：ImageLoaderUtils + * @date：2019-11-13 17:02 + * @describe：Glide加载引擎 */ public class ImageLoaderUtils { diff --git a/photo_editor/src/test/java/com/echo/photo_editor/ExampleUnitTest.java b/photo_editor/src/test/java/com/echo/photo_editor/ExampleUnitTest.java index 0ac818e..f949b12 100644 --- a/photo_editor/src/test/java/com/echo/photo_editor/ExampleUnitTest.java +++ b/photo_editor/src/test/java/com/echo/photo_editor/ExampleUnitTest.java @@ -5,9 +5,8 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation + * @author WangYuyang + * @date 2021-10-30 15:56:43 */ public class ExampleUnitTest { @Test diff --git a/stinger_game/src/androidTest/java/com/echo/stinger_game/ExampleInstrumentedTest.java b/stinger_game/src/androidTest/java/com/echo/stinger_game/ExampleInstrumentedTest.java index 77373d6..90b02c4 100644 --- a/stinger_game/src/androidTest/java/com/echo/stinger_game/ExampleInstrumentedTest.java +++ b/stinger_game/src/androidTest/java/com/echo/stinger_game/ExampleInstrumentedTest.java @@ -11,9 +11,8 @@ import org.junit.runner.RunWith; import static org.junit.Assert.*; /** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation + * @author Wang Yuyang + * @date 2021-10-30 16:08:27 */ @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { diff --git a/stinger_game/src/main/java/com/echo/stinger_game/MainActivity.java b/stinger_game/src/main/java/com/echo/stinger_game/MainActivity.java index f713b33..c88fe5f 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/MainActivity.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/MainActivity.java @@ -7,6 +7,10 @@ import android.os.Bundle; import com.echo.stinger_game.myganme.GameActivity; +/** + * @author Wang Yuyang + * @date 2021-10-30 16:08:27 + */ public class MainActivity extends AppCompatActivity { @Override diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Bird.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Bird.java index 2e2131b..4578260 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Bird.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Bird.java @@ -9,6 +9,10 @@ import android.graphics.Rect; import com.echo.stinger_game.R; +/** + * @author Wang Yuyang + * @date 2021-10-11 10:28:11 + */ public class Bird extends RectHittableObject { private Bitmap bird; private final int speed = Scene.speed; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/BirdMoving.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/BirdMoving.java index e9e96eb..707706f 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/BirdMoving.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/BirdMoving.java @@ -4,6 +4,10 @@ import android.content.Context; import java.util.Random; +/** + * @author Wang Yuyang + * @date 2021-10-11 15:38:36 + */ public class BirdMoving extends Bird { private int randomNum = 0; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Box.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Box.java index 429a24e..d851e6b 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Box.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Box.java @@ -7,6 +7,10 @@ import android.graphics.Canvas; import com.echo.stinger_game.R; +/** + * @author Wang Yuyang + * @date 2021-10-11 10:28:11 + */ public class Box extends RectHittableObject { private Bitmap obstacle; private final int speed = Scene.speed; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Cloud.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Cloud.java index a25f488..a28ed8b 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Cloud.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Cloud.java @@ -8,6 +8,10 @@ import android.graphics.Rect; import com.echo.stinger_game.R; +/** + * @author Wang Yuyang + * @date 2021-10-11 10:28:11 + */ public class Cloud extends RectHittableObject { private Bitmap cloud; private final int speed = Scene.speed; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Drawable.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Drawable.java index 288a976..74b36c2 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Drawable.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Drawable.java @@ -2,6 +2,10 @@ package com.echo.stinger_game.myganme; import android.graphics.Canvas; +/** + * @author Wang Yuyang + * @date 2021-10-10 18:51:11 + */ public interface Drawable { void draw(Canvas canvas); } diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameActivity.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameActivity.java index 2a512e7..840ad07 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameActivity.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameActivity.java @@ -8,6 +8,10 @@ import android.view.WindowManager; import androidx.appcompat.app.AppCompatActivity; +/** + * @author Wang Yuyang + * @date 2021-10-11 10:40:25 + */ public class GameActivity extends AppCompatActivity { @Override diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameView.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameView.java index d607c80..b0a9003 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameView.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/GameView.java @@ -18,6 +18,10 @@ import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.ConcurrentModificationException; +/** + * @author Wang Yuyang + * @date 2021-10-11 11:26:47 + */ public class GameView extends SurfaceView implements SurfaceHolder.Callback, Runnable { public static final Boolean DEBUG = true; public static int FPS = 60; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Ground.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Ground.java index 1a35250..162750d 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Ground.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Ground.java @@ -4,6 +4,10 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; +/** + * @author Wang Yuyang + * @date 2021-10-10 20:23:07 + */ public class Ground implements Drawable { private final Paint paint; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Hittable.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Hittable.java index ad0aed1..ba2b51a 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Hittable.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Hittable.java @@ -3,6 +3,10 @@ package com.echo.stinger_game.myganme; import android.graphics.Point; import android.graphics.Rect; +/** + * @author Wang Yuyang + * @date 2021-10-10 15:49:05 + */ public interface Hittable { Rect getBorderRect(); diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Movable.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Movable.java index e8178e1..85e8663 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Movable.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Movable.java @@ -1,5 +1,9 @@ package com.echo.stinger_game.myganme; +/** + * @author Wang Yuyang + * @date 2021-10-11 09:47:46 + */ public interface Movable { void setLocation(int x, int y); diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Player.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Player.java index fc8e640..9d7fd62 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Player.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Player.java @@ -11,6 +11,10 @@ import android.graphics.Rect; import com.echo.stinger_game.R; +/** + * @author Wang Yuyang + * @date 2021-10-11 10:48:52 + */ public class Player extends RectHittableObject { public static final int playerWidth = 150; public static final int playerHeight = 150; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/RectHittableObject.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/RectHittableObject.java index 4e6df73..b3190c0 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/RectHittableObject.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/RectHittableObject.java @@ -6,6 +6,10 @@ import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; +/** + * @author Wang Yuyang + * @date 2021-10-10 21:47:23 + */ public abstract class RectHittableObject implements Hittable, Movable, Drawable { private int x; private int y; diff --git a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Scene.java b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Scene.java index 4bbefe6..31db787 100644 --- a/stinger_game/src/main/java/com/echo/stinger_game/myganme/Scene.java +++ b/stinger_game/src/main/java/com/echo/stinger_game/myganme/Scene.java @@ -6,6 +6,10 @@ import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Random; +/** + * @author Wang Yuyang + * @date 2021-10-11 11:08:58 + */ public class Scene { public static int speed = 420; public static int distance = 0; //from right of the screen diff --git a/stinger_game/src/test/java/com/echo/stinger_game/ExampleUnitTest.java b/stinger_game/src/test/java/com/echo/stinger_game/ExampleUnitTest.java index c10977a..dd15a0d 100644 --- a/stinger_game/src/test/java/com/echo/stinger_game/ExampleUnitTest.java +++ b/stinger_game/src/test/java/com/echo/stinger_game/ExampleUnitTest.java @@ -5,9 +5,8 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation + * @author Wang Yuyang + * @date 2021-10-30 16:08:27 */ public class ExampleUnitTest { @Test