From c150ff1a0a4b39e524067def9cb680212e8946d2 Mon Sep 17 00:00:00 2001 From: Yuuki Nishiyama Date: Fri, 1 Dec 2023 05:33:30 +0900 Subject: [PATCH] Add SensorEventHandler into Conversation sensor --- AWAREFramework.podspec | 2 +- .../Plugins/Conversation/Conversation.m | 4 ++++ Example/Podfile.lock | 22 +++++++++---------- .../AWAREFramework.podspec.json | 4 ++-- Example/Pods/Manifest.lock | 22 +++++++++---------- Example/Pods/Pods.xcodeproj/project.pbxproj | 4 ++-- README.md | 2 +- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/AWAREFramework.podspec b/AWAREFramework.podspec index 877f7ac3..4ac49837 100644 --- a/AWAREFramework.podspec +++ b/AWAREFramework.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'AWAREFramework' - s.version = '1.14.5' + s.version = '1.14.6' s.summary = 'AWARE: An Open-source Context Instrumentation Framework' # This description is used to generate tags and improve search results. diff --git a/AWAREFramework/Classes/Plugins/Conversation/Conversation.m b/AWAREFramework/Classes/Plugins/Conversation/Conversation.m index bfcb0651..4f59be2e 100644 --- a/AWAREFramework/Classes/Plugins/Conversation/Conversation.m +++ b/AWAREFramework/Classes/Plugins/Conversation/Conversation.m @@ -207,6 +207,10 @@ -(void)saveConversationInfo: (long)startTime endTime:(long)endTime { NSLog(@"conversation result: %@", result); } [self setLatestValue:result]; + SensorEventHandler handler = [self getSensorEventHandler]; + if (handler!=nil) { + handler(self, audioData); + } [self.storage saveDataWithDictionary:audioData buffer:NO saveInMainThread:YES]; } diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 6769e289..a336c597 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - AWAREFramework (1.14.5): - - AWAREFramework/Core (= 1.14.5) - - AWAREFramework/Bluetooth (1.14.5): + - AWAREFramework (1.14.6): + - AWAREFramework/Core (= 1.14.6) + - AWAREFramework/Bluetooth (1.14.6): - AWAREFramework/Core - - AWAREFramework/Calendar (1.14.5): + - AWAREFramework/Calendar (1.14.6): - AWAREFramework/Core - - AWAREFramework/Contact (1.14.5): + - AWAREFramework/Contact (1.14.6): - AWAREFramework/Core - - AWAREFramework/Core (1.14.5) - - AWAREFramework/HealthKit (1.14.5): + - AWAREFramework/Core (1.14.6) + - AWAREFramework/HealthKit (1.14.6): - AWAREFramework/Core - - AWAREFramework/Microphone (1.14.5): + - AWAREFramework/Microphone (1.14.6): - AWAREFramework/Core - - AWAREFramework/MotionActivity (1.14.5): + - AWAREFramework/MotionActivity (1.14.6): - AWAREFramework/Core DEPENDENCIES: @@ -29,8 +29,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - AWAREFramework: 339449ad288a41e5bcdd252bf7fc0cb25c7ccf86 + AWAREFramework: b0674cce96cc77f46b8b3f3928ac5d97a45120cb PODFILE CHECKSUM: 8a454b54db74166846c5785b138d805caeb42579 -COCOAPODS: 1.14.2 +COCOAPODS: 1.12.1 diff --git a/Example/Pods/Local Podspecs/AWAREFramework.podspec.json b/Example/Pods/Local Podspecs/AWAREFramework.podspec.json index d1da0314..770d2f9f 100644 --- a/Example/Pods/Local Podspecs/AWAREFramework.podspec.json +++ b/Example/Pods/Local Podspecs/AWAREFramework.podspec.json @@ -1,6 +1,6 @@ { "name": "AWAREFramework", - "version": "1.14.5", + "version": "1.14.6", "summary": "AWARE: An Open-source Context Instrumentation Framework", "description": "AWARE is an Android and iOS framework dedicated to instrument, infer, log and share mobile context information, for application developers, researchers and smartphone users. AWARE captures hardware-, software-, and human-based data. They transform data into information you can understand.", "homepage": "https://github.com/tetujin/AWAREFramework-iOS", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/tetujin/AWAREFramework-iOS.git", - "tag": "1.14.5" + "tag": "1.14.6" }, "platforms": { "ios": "12.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 6769e289..a336c597 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,18 +1,18 @@ PODS: - - AWAREFramework (1.14.5): - - AWAREFramework/Core (= 1.14.5) - - AWAREFramework/Bluetooth (1.14.5): + - AWAREFramework (1.14.6): + - AWAREFramework/Core (= 1.14.6) + - AWAREFramework/Bluetooth (1.14.6): - AWAREFramework/Core - - AWAREFramework/Calendar (1.14.5): + - AWAREFramework/Calendar (1.14.6): - AWAREFramework/Core - - AWAREFramework/Contact (1.14.5): + - AWAREFramework/Contact (1.14.6): - AWAREFramework/Core - - AWAREFramework/Core (1.14.5) - - AWAREFramework/HealthKit (1.14.5): + - AWAREFramework/Core (1.14.6) + - AWAREFramework/HealthKit (1.14.6): - AWAREFramework/Core - - AWAREFramework/Microphone (1.14.5): + - AWAREFramework/Microphone (1.14.6): - AWAREFramework/Core - - AWAREFramework/MotionActivity (1.14.5): + - AWAREFramework/MotionActivity (1.14.6): - AWAREFramework/Core DEPENDENCIES: @@ -29,8 +29,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - AWAREFramework: 339449ad288a41e5bcdd252bf7fc0cb25c7ccf86 + AWAREFramework: b0674cce96cc77f46b8b3f3928ac5d97a45120cb PODFILE CHECKSUM: 8a454b54db74166846c5785b138d805caeb42579 -COCOAPODS: 1.14.2 +COCOAPODS: 1.12.1 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index af1bffcf..a93e266a 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7714,8 +7714,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1500; - LastUpgradeCheck = 1500; + LastSwiftUpdateCheck = 1300; + LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; diff --git a/README.md b/README.md index dfca422d..333a6ee6 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ AWAREFramework-iOS is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your Podfile: ```ruby -pod 'AWAREFramework', '~> 1.14.2' +pod 'AWAREFramework', '~> 1.14.6' ``` And run `pod install` in your Xcode project.