From e2e65a73c001d045cb53a882e38e81b881e6d647 Mon Sep 17 00:00:00 2001 From: SeonJK Date: Tue, 20 Sep 2022 20:50:20 +0900 Subject: [PATCH 1/3] Add getInstance() with @JvmStatic --- .../androidTest/java/co/euphony/tx/EuTxManagerTest.java | 2 +- euphony/src/main/java/co/euphony/tx/EuTxManager.kt | 9 +++++++++ euphony/src/main/java/co/euphony/ui/TxRxChecker.kt | 2 +- .../sample/fragments/tx/TxCommunicationFragment.java | 2 +- .../co/euphony/sample/fragments/tx/TxEuPIFragment.java | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/euphony/src/androidTest/java/co/euphony/tx/EuTxManagerTest.java b/euphony/src/androidTest/java/co/euphony/tx/EuTxManagerTest.java index 7160925..462e103 100644 --- a/euphony/src/androidTest/java/co/euphony/tx/EuTxManagerTest.java +++ b/euphony/src/androidTest/java/co/euphony/tx/EuTxManagerTest.java @@ -31,7 +31,7 @@ public EuTxManagerTest(String code, String asciiCode, String expectedGenCode, in @Before public void setup() { - txManager = new EuTxManager(); + txManager = EuTxManager.getInstance(); } @Test diff --git a/euphony/src/main/java/co/euphony/tx/EuTxManager.kt b/euphony/src/main/java/co/euphony/tx/EuTxManager.kt index 1254942..b44e352 100644 --- a/euphony/src/main/java/co/euphony/tx/EuTxManager.kt +++ b/euphony/src/main/java/co/euphony/tx/EuTxManager.kt @@ -29,6 +29,15 @@ class EuTxManager { txCore.code = data } + companion object { + @JvmStatic + fun getInstance() = Holder.INSTANCE + } + + private object Holder { + val INSTANCE = EuTxManager() + } + enum class EuPIDuration { LENGTH_SHORT, LENGTH_LONG, LENGTH_FOREVER } diff --git a/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt b/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt index e0b7fd9..2216120 100644 --- a/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt +++ b/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt @@ -21,7 +21,7 @@ import co.euphony.ui.viewmodel.TxRxCheckerViewModel fun TxRxChecker( dataLength: Int = 5 ) { - val viewModel = TxRxCheckerViewModel(EuTxManager(), EuRxManager.getInstance()) + val viewModel = TxRxCheckerViewModel(EuTxManager.getInstance(), EuRxManager.getInstance()) TxRxCheckerImpl(viewModel = viewModel, dataLength = dataLength) } diff --git a/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxCommunicationFragment.java b/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxCommunicationFragment.java index b1d9e36..d620e0e 100644 --- a/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxCommunicationFragment.java +++ b/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxCommunicationFragment.java @@ -48,7 +48,7 @@ public static TxCommunicationFragment newInstance(String param1, String param2) @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mTxManager = new EuTxManager(); + mTxManager = EuTxManager.getInstance(); } @Override diff --git a/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxEuPIFragment.java b/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxEuPIFragment.java index 45ded4c..acc1d6d 100644 --- a/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxEuPIFragment.java +++ b/java-sample/src/main/java/co/euphony/sample/fragments/tx/TxEuPIFragment.java @@ -27,7 +27,7 @@ public static TxEuPIFragment newInstance(String param1, String param2) { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - txManager = new EuTxManager(); + txManager = EuTxManager.getInstance(); } @Override From 31ad934b813f893676a74d6c4e77aeabf95b791c Mon Sep 17 00:00:00 2001 From: SeonJK Date: Tue, 20 Sep 2022 21:33:05 +0900 Subject: [PATCH 2/3] Modify documentations --- GETTING_STARTED.md | 4 ++-- GETTING_STARTED_KR.md | 4 ++-- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md index 8680686..51ebde0 100644 --- a/GETTING_STARTED.md +++ b/GETTING_STARTED.md @@ -21,13 +21,13 @@ This consists of two parts. - Java ```java -EuTxManager mTxManager = new EuTxManager(); +EuTxManager mTxManager = EuTxManager.getInstance(); ``` - Kotlin ```kotlin -val mTxManager = EuTxManager() +val mTxManager = EuTxManager.getInstance() ``` 2. **Use setCode method, enter the data you want to transmit.** diff --git a/GETTING_STARTED_KR.md b/GETTING_STARTED_KR.md index 82f0ab1..0994f7a 100644 --- a/GETTING_STARTED_KR.md +++ b/GETTING_STARTED_KR.md @@ -20,13 +20,13 @@ API는 Java로 작성되어 있기 때문에 사용자는 Java 또는 Kotlin과 - Java ```java -EuTxManager mTxManager = new EuTxManager(); +EuTxManager mTxManager = EuTxManager.getInstance(); ``` - Kotlin ```kotlin -val mTxManager = EuTxManager() +val mTxManager = EuTxManager.getInstance() ``` 2. **setCode 메소드로 전송할 문장을 입력** diff --git a/README.md b/README.md index a72a0aa..c3c9146 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For more detailed prerequisite, please refer to the link below. **Transmitter** ```java -EuTxManager mTxManager = new EuTxManager(); +EuTxManager mTxManager = EuTxManager.getInstance(); mTxManager.setCode("Hello, Euphony"); // To generate acoustic data "Hello, Euphony" mTxManager.play(-1); // generate sound infinite. ``` From e661f3c385c14ecc5a1a8bef111447b2d2f50ee4 Mon Sep 17 00:00:00 2001 From: SeonJK Date: Tue, 20 Sep 2022 23:52:27 +0900 Subject: [PATCH 3/3] Update README.md - Add sample-app "Wave-Cam" --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c3c9146..7ec35e9 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ Web version is also available now. but only transmitter version. - [Account Touch](https://github.com/euphony-io/account-touch) : Euphony Demo for sharing account. - [Wave Show Card](https://github.com/euphony-io/wave-show-card) : Wave Show Card helps visually impaired people listen to the show card. - [Order-With](https://github.com/euphony-io/order-with) : Euphony Demo for taking / making order in restaurant in distance easily. +- [Wave-Cam](https://github.com/euphony-io/wave-cam) : EuPI Demo to capture and switch camera in distance. ## Contributing Changes and improvements are more than welcome! Feel Free to fork and open a pull request. Please make your changes in a specific branch and request to pull into `master`.