diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 817ea731..aa851223 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -1,101 +1,101 @@ async 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/async-2.12.0/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/async-2.12.0/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/async-2.12.0/ +file:///home/slayer/.pub-cache/hosted/pub.dev/async-2.12.0/lib/ boolean_selector 3.1 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2/ +file:///home/slayer/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2/lib/ characters 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/characters-1.4.0/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/characters-1.4.0/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/characters-1.4.0/ +file:///home/slayer/.pub-cache/hosted/pub.dev/characters-1.4.0/lib/ clock 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/clock-1.1.2/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/clock-1.1.2/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/clock-1.1.2/ +file:///home/slayer/.pub-cache/hosted/pub.dev/clock-1.1.2/lib/ collection 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/collection-1.19.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/collection-1.19.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/collection-1.19.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/collection-1.19.1/lib/ fake_async 3.3 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/fake_async-1.3.2/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/fake_async-1.3.2/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/fake_async-1.3.2/ +file:///home/slayer/.pub-cache/hosted/pub.dev/fake_async-1.3.2/lib/ leak_tracker 3.2 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker-10.0.8/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker-10.0.8/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker-10.0.8/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker-10.0.8/lib/ leak_tracker_flutter_testing 3.2 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.9/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.9/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.9/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.9/lib/ leak_tracker_testing 3.2 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/lib/ matcher 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/matcher-0.12.17/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/matcher-0.12.17/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/matcher-0.12.17/ +file:///home/slayer/.pub-cache/hosted/pub.dev/matcher-0.12.17/lib/ material_color_utilities 2.17 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/lib/ meta 2.12 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/meta-1.16.0/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/meta-1.16.0/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/meta-1.16.0/ +file:///home/slayer/.pub-cache/hosted/pub.dev/meta-1.16.0/lib/ path 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/path-1.9.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/path-1.9.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/path-1.9.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/path-1.9.1/lib/ source_span 3.1 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/source_span-1.10.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/source_span-1.10.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/source_span-1.10.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/source_span-1.10.1/lib/ stack_trace 3.4 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/stack_trace-1.12.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/stack_trace-1.12.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/stack_trace-1.12.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/stack_trace-1.12.1/lib/ stream_channel 3.3 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/stream_channel-2.1.4/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/stream_channel-2.1.4/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/stream_channel-2.1.4/ +file:///home/slayer/.pub-cache/hosted/pub.dev/stream_channel-2.1.4/lib/ string_scanner 3.1 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/string_scanner-1.4.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/string_scanner-1.4.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/string_scanner-1.4.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/string_scanner-1.4.1/lib/ term_glyph 3.1 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/term_glyph-1.2.2/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/term_glyph-1.2.2/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/term_glyph-1.2.2/ +file:///home/slayer/.pub-cache/hosted/pub.dev/term_glyph-1.2.2/lib/ test_api 3.5 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/test_api-0.7.4/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/test_api-0.7.4/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/test_api-0.7.4/ +file:///home/slayer/.pub-cache/hosted/pub.dev/test_api-0.7.4/lib/ vector_math 2.14 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ +file:///home/slayer/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ vm_service 3.3 -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/vm_service-14.3.1/ -file:///Users/jinbolu/.pub-cache/hosted/pub.dev/vm_service-14.3.1/lib/ +file:///home/slayer/.pub-cache/hosted/pub.dev/vm_service-14.3.1/ +file:///home/slayer/.pub-cache/hosted/pub.dev/vm_service-14.3.1/lib/ ttlock_flutter 2.12 -file:///Users/jinbolu/Documents/Work/ttlock_flutter/ -file:///Users/jinbolu/Documents/Work/ttlock_flutter/lib/ +file:///home/slayer/Desktop/freelance_projects/ttlock_flutter/ +file:///home/slayer/Desktop/freelance_projects/ttlock_flutter/lib/ sky_engine 3.7 -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/bin/cache/pkg/sky_engine/ -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/bin/cache/pkg/sky_engine/lib/ +file:///home/slayer/flutter/bin/cache/pkg/sky_engine/ +file:///home/slayer/flutter/bin/cache/pkg/sky_engine/lib/ flutter 3.7 -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/packages/flutter/ -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/packages/flutter/lib/ +file:///home/slayer/flutter/packages/flutter/ +file:///home/slayer/flutter/packages/flutter/lib/ flutter_test 3.7 -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/packages/flutter_test/ -file:///opt/homebrew/Caskroom/flutter/3.29.3/flutter/packages/flutter_test/lib/ +file:///home/slayer/flutter/packages/flutter_test/ +file:///home/slayer/flutter/packages/flutter_test/lib/ 2 diff --git a/.dart_tool/version b/.dart_tool/version index de2819ed..e119acda 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.29.3 \ No newline at end of file +3.35.7 \ No newline at end of file diff --git a/.gitignore b/.gitignore index dfd26c22..226d3bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ build .DS_Store .packages +**/.cxx .dart_tool diff --git a/android/build.gradle b/android/build.gradle index a94e3e09..102469f4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,7 +22,7 @@ rootProject.allprojects { google() jcenter() flatDir { - dirs 'libs' + dirs project(':ttlock_flutter').file('libs') } } } @@ -30,7 +30,12 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 31 + ndkVersion "29.0.13113456 rc1" + if (project.android.hasProperty("namespace")) { + namespace 'com.ttlock.ttlock_flutter' + } + + compileSdkVersion 36 namespace 'com.ttlock.ttlock_flutter' defaultConfig { minSdkVersion 18 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 1af4b5d0..de460f36 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Dec 04 09:25:22 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/libs/ttlock-release.aar b/android/libs/ttlock-release.aar index 7e569715..92309a63 100644 Binary files a/android/libs/ttlock-release.aar and b/android/libs/ttlock-release.aar differ diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 983749c8..72765156 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,12 +22,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 34 - + compileSdkVersion 36 + ndkVersion "29.0.13113456 rc1" lintOptions { disable 'InvalidPackage' } @@ -35,7 +33,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.ttlock.ttlock_flutter_example" minSdkVersion flutter.minSdkVersion - targetSdkVersion 34 + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -56,11 +54,6 @@ android { } namespace 'com.ttlock.ttlock_flutter_example' } -repositories { - flatDir { - dirs 'libs', '..\\..\\..\\android\\libs' - } -} flutter { source '../..' diff --git a/example/android/build.gradle b/example/android/build.gradle index 6563743e..1358db0c 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,19 +1,3 @@ -buildscript { - ext { - - agp_version = '8.6.0' - } - repositories { - mavenCentral() - google() - jcenter() - } - - dependencies { - classpath "com.android.tools.build:gradle:$agp_version" - } -} - allprojects { repositories { mavenCentral() diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 9a2da3f8..7313d822 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Feb 06 11:31:35 CST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 44e62bcf..2cdf363b 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version '8.12.2' apply false + id "org.jetbrains.kotlin.android" version "2.2.10" apply false +} + +include ":app" \ No newline at end of file diff --git a/example/ios/Flutter/ephemeral/flutter_lldb_helper.py b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py new file mode 100644 index 00000000..a88caf99 --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py @@ -0,0 +1,32 @@ +# +# Generated file, do not edit. +# + +import lldb + +def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict): + """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages.""" + base = frame.register["x0"].GetValueAsAddress() + page_len = frame.register["x1"].GetValueAsUnsigned() + + # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the + # first page to see if handled it correctly. This makes diagnosing + # misconfiguration (e.g. missing breakpoint) easier. + data = bytearray(page_len) + data[0:8] = b'IHELPED!' + + error = lldb.SBError() + frame.GetThread().GetProcess().WriteMemory(base, data, error) + if not error.Success(): + print(f'Failed to write into {base}[+{page_len}]', error) + return + +def __lldb_init_module(debugger: lldb.SBDebugger, _): + target = debugger.GetDummyTarget() + # Caveat: must use BreakpointCreateByRegEx here and not + # BreakpointCreateByName. For some reasons callback function does not + # get carried over from dummy target for the later. + bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$") + bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__)) + bp.SetAutoContinue(True) + print("-- LLDB integration loaded --") diff --git a/example/ios/Flutter/ephemeral/flutter_lldbinit b/example/ios/Flutter/ephemeral/flutter_lldbinit new file mode 100644 index 00000000..e3ba6fbe --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldbinit @@ -0,0 +1,5 @@ +# +# Generated file, do not edit. +# + +command script import --relative-to-command-file flutter_lldb_helper.py diff --git a/example/lib/key_pad_page.dart b/example/lib/key_pad_page.dart index 91fc0bb3..a1236ad0 100644 --- a/example/lib/key_pad_page.dart +++ b/example/lib/key_pad_page.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:ttlock_flutter/ttelectricMeter.dart'; import 'package:bmprogresshud/progresshud.dart'; import 'package:ttlock_flutter/ttlock.dart'; import 'package:ttlock_flutter/ttremoteKeypad.dart'; @@ -79,21 +78,18 @@ class _KeyPadState extends State { }); break; case Command.addFingerprint: - TTRemoteKeypad.addFingerprint(mac, - null, - 1746673751000, - 1746760151000, - lockData, - (int currentCount, int totalCount){ - print("addFingerprint;;;currentCount:$currentCount;;;;totalCount:$totalCount"); - }, (String fingerprintNumber) { - print("addFingerprint fingerprintNumber:$fingerprintNumber"); - }, (errorCode, errorMsg) { - print("addFingerprint;;;errorCode:$errorCode;;;;errorMsg:$errorMsg"); - - }, (TTRemoteKeyPadAccessoryError errorCode, String errorMsg){ - print("addFingerprint;;;errorCode:$errorCode;;;;errorMsg:$errorMsg"); - }); + TTRemoteKeypad.addFingerprint( + mac, null, 1746673751000, 1746760151000, lockData, + (int currentCount, int totalCount) { + print( + "addFingerprint;;;currentCount:$currentCount;;;;totalCount:$totalCount"); + }, (String fingerprintNumber) { + print("addFingerprint fingerprintNumber:$fingerprintNumber"); + }, (errorCode, errorMsg) { + print("addFingerprint;;;errorCode:$errorCode;;;;errorMsg:$errorMsg"); + }, (TTRemoteKeyPadAccessoryError errorCode, String errorMsg) { + print("addFingerprint;;;errorCode:$errorCode;;;;errorMsg:$errorMsg"); + }); break; case Command.addCard: break; diff --git a/example/lib/scan_page.dart b/example/lib/scan_page.dart index 7510a9ed..e13fda16 100644 --- a/example/lib/scan_page.dart +++ b/example/lib/scan_page.dart @@ -4,7 +4,6 @@ import 'package:ttlock_flutter/ttgateway.dart'; import 'package:ttlock_flutter/ttlock.dart'; import 'package:ttlock_flutter/ttremoteKeypad.dart'; import 'package:ttlock_flutter_example/gateway_page.dart'; -import 'config.dart'; import 'key_pad_page.dart'; import 'wifi_page.dart'; import 'package:bmprogresshud/progresshud.dart'; diff --git a/example/pubspec.lock b/example/pubspec.lock index 526a894c..b131b8c6 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" bmprogresshud: dependency: "direct main" description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -79,26 +79,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: @@ -180,10 +180,10 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.6" ttlock_flutter: dependency: "direct main" description: @@ -195,18 +195,18 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "15.0.2" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/lib/ttelectricMeter.dart b/lib/ttelectricMeter.dart index 8140813e..80376826 100644 --- a/lib/ttelectricMeter.dart +++ b/lib/ttelectricMeter.dart @@ -1,5 +1,4 @@ // import 'package:ttlock_flutter/ttlock.dart'; -import 'dart:convert' as convert; import 'package:ttlock_flutter/ttlock.dart'; diff --git a/lib/ttlock.dart b/lib/ttlock.dart index ffd2ffbc..6c107625 100644 --- a/lib/ttlock.dart +++ b/lib/ttlock.dart @@ -1696,23 +1696,19 @@ class TTLock { .COMMAND_MULTIFUNCTIONAL_REMOTE_KEYPAD_ADD_FINGERPRINT || command == TTRemoteKeypad.COMMAND_MULTIFUNCTIONAL_REMOTE_KEYPAD_ADD_CARD) { - - if(data["errorDevice"] == TTErrorDevice.keyPad.index) - { - TTRemoteKeypadFailedCallback? failedCallback = otherCallBack; - TTRemoteKeyPadAccessoryError error = - TTRemoteKeyPadAccessoryError.values[errorCode]; - if (failedCallback != null) { - failedCallback(error, errorMessage); - } - }else - { - if(errorCode<0) - { - errorCode = 0; - } - callBack?.call(TTLockError.values[errorCode], errorMessage); - } + if (data["errorDevice"] == TTErrorDevice.keyPad.index) { + TTRemoteKeypadFailedCallback? failedCallback = otherCallBack; + TTRemoteKeyPadAccessoryError error = + TTRemoteKeyPadAccessoryError.values[errorCode]; + if (failedCallback != null) { + failedCallback(error, errorMessage); + } + } else { + if (errorCode < 0) { + errorCode = 0; + } + callBack?.call(TTLockError.values[errorCode], errorMessage); + } } //蓝牙水电表失败处理 diff --git a/lib/ttwaterMeter.dart b/lib/ttwaterMeter.dart index 5bb4409a..850acb9e 100644 --- a/lib/ttwaterMeter.dart +++ b/lib/ttwaterMeter.dart @@ -1,5 +1,4 @@ import 'package:ttlock_flutter/ttlock.dart'; -import 'dart:convert' as convert; class TTWaterMeter { static const String COMMAND_CONFIG_SERVER_WATER_METER = diff --git a/pubspec.lock b/pubspec.lock index a91a1d47..697e1deb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" boolean_selector: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -63,26 +63,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: @@ -164,26 +164,26 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.6" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "15.0.2" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54"