diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java deleted file mode 100644 index cda012e..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.models; - -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModelManager; -import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; - -/** - * モデルを管理する - *

- * singleton - * - * @author s.iwatani - */ -public class CactusModels extends GameBaseModelManager implements OnlineModel { - private String instanceId = ""; - - public CactusModels() { - super(); - } - - public void setInstanceId(String id) { - for (GameBaseModel model : models) { - model.setInstanceId(id); - } - for (GameBaseModel model : nextAddModels) { - model.setInstanceId(id); - } - instanceId = id; - } - - @Override - public void onResponse(String response) { - - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusRepository.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusRepository.java new file mode 100644 index 0000000..961c027 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusRepository.java @@ -0,0 +1,40 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameModelContainer; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; + +/** + * モデルを管理する + *

+ * singleton + * + * @author s.iwatani + */ +public class CactusRepository extends GameModelContainer implements OnlineModel { + private String instanceId = ""; + + public CactusRepository() { + super(); + } + + public void setInstanceId(String id) { + for (GameBaseModel model : models) { + model.setInstanceId(id); + } + for (GameBaseModel model : nextAddModels) { + model.setInstanceId(id); + } + instanceId = id; + } + + @Override + public void update(double interval) { + super.update(interval); + } + + @Override + public void onResponse(String response) { + + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateBoundary.java new file mode 100644 index 0000000..f1776d1 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateBoundary.java @@ -0,0 +1,11 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +public interface UpdateBoundary { + + /** + * モデルの状態を更新する + + * @param interval 前回の更新からの時間差 + */ + void onUpdate(double interval); +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateUsecase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateUsecase.java new file mode 100644 index 0000000..177af6f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/UpdateUsecase.java @@ -0,0 +1,11 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +public class UpdateUsecase implements UpdateBoundary { + CactusRepository cactusRepository; + + @Override + public void onUpdate(double interval) { + cactusRepository.update(interval); + + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test deleted file mode 100644 index d75fa73..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - -