From ab8966fe84c18fff5061271308f4c34dad48bbc1 Mon Sep 17 00:00:00 2001 From: Hyejin Park <89901283+phj0407@users.noreply.github.com> Date: Tue, 13 Sep 2022 21:28:43 +0900 Subject: [PATCH 1/6] Update README.md, add sample project: order-with --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fb142ec..34842fa 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ Web version is also available now. but only transmitter version. - [Wave-In (for store)](https://github.com/euphony-io/wave-in-listener) : COVID-19 Check-in solution for store using a safe number based on MVVM model. - [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. ## 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`. From 7f2280dda1ec6b8ddb713b595268ae15aaed90e0 Mon Sep 17 00:00:00 2001 From: Park Hyejin Date: Thu, 15 Sep 2022 21:10:30 +0900 Subject: [PATCH 2/6] feat: apply EuRxManager Singleton (#255) --- .../main/java/co/euphony/rx/EuRxManager.java | 25 ++++++++----------- .../main/java/co/euphony/ui/TxRxChecker.kt | 2 +- .../fragments/rx/RxCommunicationFragment.java | 2 +- .../sample/fragments/rx/RxEuPIFragment.java | 6 ++++- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/euphony/src/main/java/co/euphony/rx/EuRxManager.java b/euphony/src/main/java/co/euphony/rx/EuRxManager.java index 174c51d..b7f7ff4 100644 --- a/euphony/src/main/java/co/euphony/rx/EuRxManager.java +++ b/euphony/src/main/java/co/euphony/rx/EuRxManager.java @@ -44,26 +44,21 @@ public enum RxEngineType { private EuOption mOption; - public EuRxManager() { - mOption = EuOption.builder() - .modeWith(EuOption.ModeType.DEFAULT) - .encodingWith(EuOption.CodingType.BASE16) - .modulationWith(EuOption.ModulationType.FSK) - .build(); + private static class InnerInstanceClazz{ + private static final EuRxManager instance = new EuRxManager(); } - public EuRxManager(RxEngineType engineType) { - rxEngineType = engineType; - if(rxEngineType == RxEngineType.EUPHONY_NATIVE_ENGINE) - nativeCore = EuNativeConnector.getInstance(); - else - nativeCore = null; + public static EuRxManager getInstance(){ + return InnerInstanceClazz.instance; } - public EuRxManager(EuOption.ModeType mode) { - mOption = EuOption.builder() - .modeWith(mode) + private EuRxManager(){ + this.mOption = EuOption.builder() + .modeWith(EuOption.ModeType.DEFAULT) + .encodingWith(EuOption.CodingType.BASE16) + .modulationWith(EuOption.ModulationType.FSK) .build(); + Log.d(LOG, "EuRxManager creation was successful"); } private boolean listenOnJava(long timeout, @Nullable EuTimeOutListener listener) { diff --git a/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt b/euphony/src/main/java/co/euphony/ui/TxRxChecker.kt index f116591..e0b7fd9 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()) + val viewModel = TxRxCheckerViewModel(EuTxManager(), EuRxManager.getInstance()) TxRxCheckerImpl(viewModel = viewModel, dataLength = dataLength) } diff --git a/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxCommunicationFragment.java b/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxCommunicationFragment.java index f302151..4fde20c 100644 --- a/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxCommunicationFragment.java +++ b/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxCommunicationFragment.java @@ -16,7 +16,7 @@ public class RxCommunicationFragment extends Fragment { - EuRxManager mRxManager = new EuRxManager(); + EuRxManager mRxManager = EuRxManager.getInstance(); private TextView listenView = null; private Button listenBtn = null; diff --git a/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxEuPIFragment.java b/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxEuPIFragment.java index acab2c7..0fcbb61 100644 --- a/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxEuPIFragment.java +++ b/java-sample/src/main/java/co/euphony/sample/fragments/rx/RxEuPIFragment.java @@ -19,7 +19,10 @@ public class RxEuPIFragment extends Fragment { - EuRxManager mRxManager = new EuRxManager(EuOption.ModeType.EUPI); + EuRxManager mRxManager = EuRxManager.getInstance(); + EuOption mOption = EuOption.builder() + .modeWith(EuOption.ModeType.EUPI) + .build(); Integer[] mFrequencies = new Integer[] {18500, 19000, 19500, 20000, 20500}; HashMap mEuPICounters = new HashMap<>(); @@ -49,6 +52,7 @@ public void onStop() { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + mRxManager.setOption(mOption); // Inflate the layout for this fragment View v = inflater.inflate(R.layout.fragment_rx_eupi, container, false); LinearLayoutCompat linearLayout = v.findViewById(R.id.frequency_view_list); From 040d323ad663dcfbafbf1f6033e8b297817f32b5 Mon Sep 17 00:00:00 2001 From: Park Hyejin Date: Thu, 15 Sep 2022 23:38:57 +0900 Subject: [PATCH 3/6] Update EuRxManagerTest depending on applying EuRxManager singleton --- euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt b/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt index e536314..7ac07fb 100644 --- a/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt +++ b/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt @@ -9,13 +9,13 @@ class EuRxManagerTest { @Test(expected = Test.None::class) /* no exception expected */ fun withExceptionHandlingNoErrorOccurs() { - val rxManager = EuRxManager() + val rxManager = EuRxManager.getInstance() rxManager.listen() } @Test fun testListenWithTimeout() { - val rxManager = EuRxManager() + val rxManager = EuRxManager.getInstance() rxManager.listen(1000) assertEquals(EuRxManager.RxManagerStatus.RUNNING, rxManager.status) From 598bb36fc9808c4ed2234ba77b71ab91a3f2a433 Mon Sep 17 00:00:00 2001 From: Park Hyejin Date: Thu, 15 Sep 2022 23:45:39 +0900 Subject: [PATCH 4/6] docs: update 'README.md', 'GETTING_STARTED.md', 'GETTING_STARTED_KR.mc' depending on applying EuRxManager singleton --- 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 41fd60b..8680686 100644 --- a/GETTING_STARTED.md +++ b/GETTING_STARTED.md @@ -74,13 +74,13 @@ mTxManager.play(-1) - Java ```java -EuRxManager mRxManager = new EuRxManager(); +EuRxManager mRxManager = EuRxManager.getInstance(); ``` - Kotlin ```kotlin -val mRxManager = EuRxManager() +val mRxManager = EuRxManager.getInstance() ``` 2. **Listener settings that receive and process sound waves** diff --git a/GETTING_STARTED_KR.md b/GETTING_STARTED_KR.md index 3576e96..82f0ab1 100644 --- a/GETTING_STARTED_KR.md +++ b/GETTING_STARTED_KR.md @@ -71,13 +71,13 @@ mTxManager.play(-1) - Java ```java -EuRxManager mRxManager = new EuRxManager(); +EuRxManager mRxManager = EuRxManager.getInstance(); ``` - Kotlin ```kotlin -val mRxManager = EuRxManager() +val mRxManager = EuRxManager.getInstance() ``` 2. **음파를 받아오고 처리하는 Listener를 설정** diff --git a/README.md b/README.md index 34842fa..a72a0aa 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ mTxManager.play(-1); // generate sound infinite. **Receiver** ```java -EuRxManager mRxManager = new EuRxManager(); +EuRxManager mRxManager = EuRxManager.getInstance(); mRxManager.setAcousticSensor(new AcousticSensor() { @Override public void notify(String letters) { From 40b8375f5b9ab056b4f0ad51728f3c712d32b6b0 Mon Sep 17 00:00:00 2001 From: Hyejin Park <89901283+phj0407@users.noreply.github.com> Date: Tue, 20 Sep 2022 21:32:38 +0900 Subject: [PATCH 5/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a72a0aa..b9ef545 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-PDF] (https://github.com/euphony-io/wave-pdf) : EuPI Demo to show and control PDF file. ## 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`. From 31d7dd37933ce590156dd58b7787ed6ed37bcfb1 Mon Sep 17 00:00:00 2001 From: Park Hyejin Date: Tue, 4 Oct 2022 21:42:54 +0900 Subject: [PATCH 6/6] bug: add finish() in EuRxManagerTest withExceptionHandlingNoErrorOccurs --- euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt b/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt index 7ac07fb..06e5ed7 100644 --- a/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt +++ b/euphony/src/androidTest/java/co/euphony/rx/EuRxManagerTest.kt @@ -11,6 +11,7 @@ class EuRxManagerTest { fun withExceptionHandlingNoErrorOccurs() { val rxManager = EuRxManager.getInstance() rxManager.listen() + rxManager.finish() } @Test