Skip to content

Commit 9b9ec5a

Browse files
committed
Fix TCP
git tag v1.0.5+77
1 parent 4d447bc commit 9b9ec5a

File tree

8 files changed

+151
-13
lines changed

8 files changed

+151
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.0.5+77]
2+
3+
* Fix TCP
4+
15
## [1.0.5+76]
26

37
* Add gateway name description config;auto add host and gateway port

example/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Foundation
88
import bonsoir_darwin
99
import file_picker
1010
import file_selector_macos
11+
import flutter_inappwebview_macos
1112
import network_info_plus
1213
import package_info_plus
1314
import path_provider_foundation
@@ -21,6 +22,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
2122
SwiftBonsoirPlugin.register(with: registry.registrar(forPlugin: "SwiftBonsoirPlugin"))
2223
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
2324
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
25+
InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
2426
NetworkInfoPlusPlugin.register(with: registry.registrar(forPlugin: "NetworkInfoPlusPlugin"))
2527
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
2628
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

example/pubspec.lock

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,70 @@ packages:
390390
url: "https://pub.flutter-io.cn"
391391
source: hosted
392392
version: "1.1.0"
393+
flutter_inappwebview:
394+
dependency: transitive
395+
description:
396+
name: flutter_inappwebview
397+
sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
398+
url: "https://pub.flutter-io.cn"
399+
source: hosted
400+
version: "6.1.5"
401+
flutter_inappwebview_android:
402+
dependency: transitive
403+
description:
404+
name: flutter_inappwebview_android
405+
sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
406+
url: "https://pub.flutter-io.cn"
407+
source: hosted
408+
version: "1.1.3"
409+
flutter_inappwebview_internal_annotations:
410+
dependency: transitive
411+
description:
412+
name: flutter_inappwebview_internal_annotations
413+
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
414+
url: "https://pub.flutter-io.cn"
415+
source: hosted
416+
version: "1.2.0"
417+
flutter_inappwebview_ios:
418+
dependency: transitive
419+
description:
420+
name: flutter_inappwebview_ios
421+
sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
422+
url: "https://pub.flutter-io.cn"
423+
source: hosted
424+
version: "1.1.2"
425+
flutter_inappwebview_macos:
426+
dependency: transitive
427+
description:
428+
name: flutter_inappwebview_macos
429+
sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
430+
url: "https://pub.flutter-io.cn"
431+
source: hosted
432+
version: "1.1.2"
433+
flutter_inappwebview_platform_interface:
434+
dependency: transitive
435+
description:
436+
name: flutter_inappwebview_platform_interface
437+
sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
438+
url: "https://pub.flutter-io.cn"
439+
source: hosted
440+
version: "1.3.0+1"
441+
flutter_inappwebview_web:
442+
dependency: transitive
443+
description:
444+
name: flutter_inappwebview_web
445+
sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
446+
url: "https://pub.flutter-io.cn"
447+
source: hosted
448+
version: "1.1.2"
449+
flutter_inappwebview_windows:
450+
dependency: transitive
451+
description:
452+
name: flutter_inappwebview_windows
453+
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
454+
url: "https://pub.flutter-io.cn"
455+
source: hosted
456+
version: "0.6.0"
393457
flutter_lints:
394458
dependency: "direct dev"
395459
description:
@@ -745,17 +809,17 @@ packages:
745809
dependency: transitive
746810
description:
747811
name: openiothub_api
748-
sha256: "44f6b434c2c8a28b129ea901a4a2fa57cd8bd46b8c8c037c7bb74e175e7f619f"
812+
sha256: ee3b3c886240331b48510f5a0ba3dc340d39edd734b54f435e98af610da76672
749813
url: "https://pub.flutter-io.cn"
750814
source: hosted
751-
version: "1.0.5+7"
815+
version: "1.0.5+8"
752816
openiothub_common_pages:
753817
dependency: "direct main"
754818
description:
755819
path: ".."
756820
relative: true
757821
source: path
758-
version: "1.0.5+73"
822+
version: "1.0.5+77"
759823
openiothub_constants:
760824
dependency: "direct main"
761825
description:
@@ -776,10 +840,10 @@ packages:
776840
dependency: transitive
777841
description:
778842
name: openiothub_plugin
779-
sha256: "2c32baf0f5cd21e1b101ed490e878fc06973e23d8220f8e1d543e59531a678d8"
843+
sha256: c4d9875788253b625e01a3a8a28b4bfff3dd178668800745df6ab3ee6078c0e7
780844
url: "https://pub.flutter-io.cn"
781845
source: hosted
782-
version: "1.0.2+45"
846+
version: "1.0.2+46"
783847
package_info_plus:
784848
dependency: transitive
785849
description:

example/windows/flutter/generated_plugin_registrant.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <bonsoir_windows/bonsoir_windows_plugin_c_api.h>
1010
#include <file_selector_windows/file_selector_windows.h>
11+
#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
1112
#include <permission_handler_windows/permission_handler_windows_plugin.h>
1213
#include <url_launcher_windows/url_launcher_windows.h>
1314

@@ -16,6 +17,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
1617
registry->GetRegistrarForPlugin("BonsoirWindowsPluginCApi"));
1718
FileSelectorWindowsRegisterWithRegistrar(
1819
registry->GetRegistrarForPlugin("FileSelectorWindows"));
20+
FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
21+
registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
1922
PermissionHandlerWindowsPluginRegisterWithRegistrar(
2023
registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
2124
UrlLauncherWindowsRegisterWithRegistrar(

example/windows/flutter/generated_plugins.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
bonsoir_windows
77
file_selector_windows
8+
flutter_inappwebview_windows
89
permission_handler_windows
910
url_launcher_windows
1011
)

lib/commPages/findGatewayGoList.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ class _FindGatewayGoListPageState extends State<FindGatewayGoListPage> {
314314
}
315315
//自动 添加网关主机
316316
var device = Device();
317-
device.runId = getOneUUID();
317+
device.runId = gatewayId;
318318
device.uuid = getOneUUID();
319319
device.name = name;
320320
device.description = description;
@@ -324,12 +324,12 @@ class _FindGatewayGoListPageState extends State<FindGatewayGoListPage> {
324324
var tcpConfig = PortConfig();
325325
tcpConfig.device = device;
326326
tcpConfig.name = "$name Gateway";
327-
tcpConfig.description = "$name Gateway";
327+
tcpConfig.description = "$description Gateway";
328328
tcpConfig.remotePort = 34323;
329329
tcpConfig.localProt = 0;
330330
tcpConfig.networkProtocol = "tcp";
331331
tcpConfig.applicationProtocol = "http";
332-
CommonDeviceApi.createOneUDP(tcpConfig);
332+
await CommonDeviceApi.createOneTCP(tcpConfig);
333333
} catch (exception) {
334334
TDToast.showText("Failed: ${exception}", context: context);
335335
}

pubspec.lock

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,70 @@ packages:
518518
url: "https://pub.flutter-io.cn"
519519
source: hosted
520520
version: "5.10.0"
521+
flutter_inappwebview:
522+
dependency: transitive
523+
description:
524+
name: flutter_inappwebview
525+
sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
526+
url: "https://pub.flutter-io.cn"
527+
source: hosted
528+
version: "6.1.5"
529+
flutter_inappwebview_android:
530+
dependency: transitive
531+
description:
532+
name: flutter_inappwebview_android
533+
sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
534+
url: "https://pub.flutter-io.cn"
535+
source: hosted
536+
version: "1.1.3"
537+
flutter_inappwebview_internal_annotations:
538+
dependency: transitive
539+
description:
540+
name: flutter_inappwebview_internal_annotations
541+
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
542+
url: "https://pub.flutter-io.cn"
543+
source: hosted
544+
version: "1.2.0"
545+
flutter_inappwebview_ios:
546+
dependency: transitive
547+
description:
548+
name: flutter_inappwebview_ios
549+
sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
550+
url: "https://pub.flutter-io.cn"
551+
source: hosted
552+
version: "1.1.2"
553+
flutter_inappwebview_macos:
554+
dependency: transitive
555+
description:
556+
name: flutter_inappwebview_macos
557+
sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
558+
url: "https://pub.flutter-io.cn"
559+
source: hosted
560+
version: "1.1.2"
561+
flutter_inappwebview_platform_interface:
562+
dependency: transitive
563+
description:
564+
name: flutter_inappwebview_platform_interface
565+
sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
566+
url: "https://pub.flutter-io.cn"
567+
source: hosted
568+
version: "1.3.0+1"
569+
flutter_inappwebview_web:
570+
dependency: transitive
571+
description:
572+
name: flutter_inappwebview_web
573+
sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
574+
url: "https://pub.flutter-io.cn"
575+
source: hosted
576+
version: "1.1.2"
577+
flutter_inappwebview_windows:
578+
dependency: transitive
579+
description:
580+
name: flutter_inappwebview_windows
581+
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
582+
url: "https://pub.flutter-io.cn"
583+
source: hosted
584+
version: "0.6.0"
521585
flutter_localizations:
522586
dependency: "direct main"
523587
description: flutter
@@ -929,10 +993,10 @@ packages:
929993
dependency: "direct main"
930994
description:
931995
name: openiothub_api
932-
sha256: "44f6b434c2c8a28b129ea901a4a2fa57cd8bd46b8c8c037c7bb74e175e7f619f"
996+
sha256: ee3b3c886240331b48510f5a0ba3dc340d39edd734b54f435e98af610da76672
933997
url: "https://pub.flutter-io.cn"
934998
source: hosted
935-
version: "1.0.5+7"
999+
version: "1.0.5+8"
9361000
openiothub_constants:
9371001
dependency: "direct main"
9381002
description:
@@ -953,10 +1017,10 @@ packages:
9531017
dependency: "direct main"
9541018
description:
9551019
name: openiothub_plugin
956-
sha256: "2c32baf0f5cd21e1b101ed490e878fc06973e23d8220f8e1d543e59531a678d8"
1020+
sha256: c4d9875788253b625e01a3a8a28b4bfff3dd178668800745df6ab3ee6078c0e7
9571021
url: "https://pub.flutter-io.cn"
9581022
source: hosted
959-
version: "1.0.2+45"
1023+
version: "1.0.2+46"
9601024
package_config:
9611025
dependency: transitive
9621026
description:

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: openiothub_common_pages
22
description: openiothub_common_pages
3-
version: 1.0.5+76
3+
version: 1.0.5+77
44
homepage: https://github.com/OpenIoTHub
55

66
environment:

0 commit comments

Comments
 (0)