TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convet ByteArray to std::string in ble_gatt_client

Browse Source 
PiperOrigin-RevId: 514786088
This commit is contained in:
Qin Wang
2023-03-07 11:10:34 -08:00
committed by Copybara-Service
parent ead3df1ff8
commit 0c078b3528
12 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/ble_gatt_client.cc
+7 -7
View File
@@ -275,7 +275,7 @@ BleGattClient::GetCharacteristic(const Uuid& service_uuid,
return absl::nullopt;
}
absl::optional<ByteArray> BleGattClient::ReadCharacteristic(
absl::optional<std::string> BleGattClient::ReadCharacteristic(
const api::ble_v2::GattCharacteristic& characteristic) {
NEARBY_LOGS(VERBOSE) << __func__ << ": Read characteristic="
<< std::string(characteristic.uuid);
@@ -316,7 +316,7 @@ absl::optional<ByteArray> BleGattClient::ReadCharacteristic(
NEARBY_LOGS(VERBOSE) << __func__
<< ": Got characteristic value length=" << data.size();
return ByteArray(data);
return data;
} catch (std::exception exception) {
NEARBY_LOGS(ERROR) << __func__
<< ": Failed to read GATT characteristic. exception: "
@@ -332,7 +332,7 @@ absl::optional<ByteArray> BleGattClient::ReadCharacteristic(
bool BleGattClient::WriteCharacteristic(
const api::ble_v2::GattCharacteristic& characteristic,
const ByteArray& value) {
absl::string_view value) {
NEARBY_LOGS(VERBOSE) << __func__ << ": write characteristic: "
<< std::string(characteristic.uuid);
absl::MutexLock lock(&mutex_);
@@ -380,7 +380,7 @@ bool BleGattClient::WriteCharacteristic(
bool BleGattClient::SetCharacteristicSubscription(
const api::ble_v2::GattCharacteristic& characteristic, bool enable,
absl::AnyInvocable<void(const ByteArray& value)>
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb) {
NEARBY_LOGS(VERBOSE) << __func__
<< ": Started to set Characteristic Subscription.";
@@ -577,7 +577,8 @@ bool BleGattClient::WriteCharacteristicConfigurationDescriptor(
void BleGattClient::OnCharacteristicValueChanged(
GattCharacteristic const& characteristic, GattValueChangedEventArgs args,
absl::AnyInvocable<void(ByteArray& value)> on_characteristic_changed_cb) {
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb) {
NEARBY_LOGS(VERBOSE) << __func__ << "Gatt Characteristic value changed.";
IBuffer buffer = args.CharacteristicValue();
int size = buffer.Length();
@@ -589,8 +590,7 @@ void BleGattClient::OnCharacteristicValueChanged(
}
NEARBY_LOGS(VERBOSE) << __func__
<< ": Got characteristic value length= " << data.size();
ByteArray value = ByteArray(data);
on_characteristic_changed_cb(value);
on_characteristic_changed_cb(data);
}
} // namespace windows
internal/platform/implementation/windows/ble_gatt_client.h
+6 -4
View File
@@ -20,6 +20,7 @@
#include <cstddef>
#include <memory>
#include <optional>
#include <string>
#include <vector>
#include "absl/container/flat_hash_map.h"
@@ -46,16 +47,16 @@ class BleGattClient : public api::ble_v2::GattClient {
absl::optional<api::ble_v2::GattCharacteristic> GetCharacteristic(
const Uuid& service_uuid, const Uuid& characteristic_uuid) override;
absl::optional<ByteArray> ReadCharacteristic(
absl::optional<std::string> ReadCharacteristic(
const api::ble_v2::GattCharacteristic& characteristic) override;
bool WriteCharacteristic(
const api::ble_v2::GattCharacteristic& characteristic,
const ByteArray& value) override;
absl::string_view value) override;
bool SetCharacteristicSubscription(
const api::ble_v2::GattCharacteristic& characteristic, bool enable,
absl::AnyInvocable<void(const ByteArray& value)>
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb) override;
void Disconnect() override;
@@ -84,7 +85,8 @@ class BleGattClient : public api::ble_v2::GattClient {
GattCharacteristic const& characteristic,
::winrt::Windows::Devices::Bluetooth::GenericAttributeProfile::
GattValueChangedEventArgs args,
absl::AnyInvocable<void(ByteArray& value)> on_characteristic_changed_cb);
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb);
absl::Mutex mutex_;