From 48245694033c42983db09917868bd0876bcf1564 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Sat, 16 Apr 2022 02:41:22 +0900 Subject: [PATCH 1/2] [connectivity_plus] Add bluetooth as connectivity result --- packages/connectivity_plus/CHANGELOG.md | 7 +++++++ packages/connectivity_plus/README.md | 4 ++-- packages/connectivity_plus/example/pubspec.yaml | 2 +- packages/connectivity_plus/pubspec.yaml | 4 ++-- packages/connectivity_plus/tizen/src/connection.cc | 2 ++ packages/connectivity_plus/tizen/src/connection.h | 9 ++++++++- .../tizen/src/connectivity_plus_tizen_plugin.cc | 2 ++ 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/packages/connectivity_plus/CHANGELOG.md b/packages/connectivity_plus/CHANGELOG.md index 71c30a12b..274572a26 100644 --- a/packages/connectivity_plus/CHANGELOG.md +++ b/packages/connectivity_plus/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.1.1 + +* Update connectivity_plus to 2.3.0. +* Update connectivity_plus_platform_interface to 1.2.0. +* Support bluetooth as connectivity result. +* Code refactoring. + ## 1.1.0 * Update connectivity_plus to 2.1.0. diff --git a/packages/connectivity_plus/README.md b/packages/connectivity_plus/README.md index 73bb55b73..e9ba3170a 100644 --- a/packages/connectivity_plus/README.md +++ b/packages/connectivity_plus/README.md @@ -10,8 +10,8 @@ This package is not an _endorsed_ implementation of `connectivity_plus`. Therefo ```yaml dependencies: - connectivity_plus: ^2.1.0 - connectivity_plus_tizen: ^1.1.0 + connectivity_plus: ^2.3.0 + connectivity_plus_tizen: ^1.1.1 ``` Then you can import `connectivity_plus` in your Dart code: diff --git a/packages/connectivity_plus/example/pubspec.yaml b/packages/connectivity_plus/example/pubspec.yaml index b924a4a5e..d1543154e 100644 --- a/packages/connectivity_plus/example/pubspec.yaml +++ b/packages/connectivity_plus/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the connectivity_plus_tizen plugin. publish_to: "none" dependencies: - connectivity_plus: ^2.1.0 + connectivity_plus: ^2.3.0 connectivity_plus_tizen: path: ../ flutter: diff --git a/packages/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/pubspec.yaml index 810bd5dff..79ff9a731 100644 --- a/packages/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/pubspec.yaml @@ -2,7 +2,7 @@ name: connectivity_plus_tizen description: Tizen implementation of the connectivity_plus plugin. homepage: https://github.com/flutter-tizen/plugins repository: https://github.com/flutter-tizen/plugins/tree/master/packages/connectivity_plus -version: 1.1.0 +version: 1.1.1 flutter: plugin: @@ -12,7 +12,7 @@ flutter: fileName: connectivity_plus_tizen_plugin.h dependencies: - connectivity_plus_platform_interface: ^1.1.1 + connectivity_plus_platform_interface: ^1.2.0 flutter: sdk: flutter diff --git a/packages/connectivity_plus/tizen/src/connection.cc b/packages/connectivity_plus/tizen/src/connection.cc index 6dae48029..fe11c24cc 100644 --- a/packages/connectivity_plus/tizen/src/connection.cc +++ b/packages/connectivity_plus/tizen/src/connection.cc @@ -14,6 +14,8 @@ static ConnectionType ToConnectionType(connection_type_e type) { return ConnectionType::kMobile; case CONNECTION_TYPE_ETHERNET: return ConnectionType::kEthernet; + case CONNECTION_TYPE_BT: + return ConnectionType::kBluetooth; case CONNECTION_TYPE_DISCONNECTED: default: return ConnectionType::kNone; diff --git a/packages/connectivity_plus/tizen/src/connection.h b/packages/connectivity_plus/tizen/src/connection.h index e5ffc6975..41bb79b87 100644 --- a/packages/connectivity_plus/tizen/src/connection.h +++ b/packages/connectivity_plus/tizen/src/connection.h @@ -11,7 +11,14 @@ #include #include -enum class ConnectionType { kNone, kEthernet, kWiFi, kMobile, kError }; +enum class ConnectionType { + kNone, + kEthernet, + kWiFi, + kMobile, + kBluetooth, + kError +}; typedef std::function ConnectionTypeCallback; diff --git a/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc b/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc index cbd6c5dd5..0c3d160bd 100644 --- a/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc +++ b/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc @@ -35,6 +35,8 @@ std::string ConnectionTypeToString(ConnectionType type) { return "wifi"; case ConnectionType::kMobile: return "mobile"; + case ConnectionType::kBluetooth: + return "bluetooth"; case ConnectionType::kNone: default: return "none"; From 38910929529533dad680fa642bc20a5bf304e2f2 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Mon, 18 Apr 2022 12:36:40 +0900 Subject: [PATCH 2/2] Hold a reference to EventChannel --- .../tizen/src/connectivity_plus_tizen_plugin.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc b/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc index 0c3d160bd..76ff27a52 100644 --- a/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc +++ b/packages/connectivity_plus/tizen/src/connectivity_plus_tizen_plugin.cc @@ -95,10 +95,10 @@ class ConnectivityPlusTizenPlugin : public flutter::Plugin { plugin_pointer->HandleMethodCall(call, std::move(result)); }); - auto event_channel = std::make_unique( + plugin->event_channel_ = std::make_unique( registrar->messenger(), "dev.fluttercommunity.plus/connectivity_status", &flutter::StandardMethodCodec::GetInstance()); - event_channel->SetStreamHandler( + plugin->event_channel_->SetStreamHandler( std::make_unique()); registrar->AddPlugin(std::move(plugin)); @@ -126,6 +126,8 @@ class ConnectivityPlusTizenPlugin : public flutter::Plugin { result->NotImplemented(); } } + + std::unique_ptr event_channel_; }; } // namespace