Feature/update gradle config

.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

.dart_tool/version

@@ -1 +1 @@
-3.29.3
+3.29.3

.gitignore

@@ -3,5 +3,6 @@ build
 
 .DS_Store
 .packages
+**/.cxx
 .dart_tool
 

android/build.gradle

@@ -22,14 +22,19 @@ rootProject.allprojects {
         google()
         jcenter()
         flatDir {
-            dirs 'libs'
+            dirs project(':ttlock_flutter').file('libs')
         }
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.ttlock.ttlock_flutter'
+    }
+
     compileSdkVersion 31
     namespace 'com.ttlock.ttlock_flutter'
     defaultConfig {

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,9 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     compileSdkVersion 34
 
@@ -56,11 +54,6 @@ android {
     }
     namespace 'com.ttlock.ttlock_flutter_example'
 }
-repositories {
-    flatDir {
-        dirs 'libs', '..\\..\\..\\android\\libs'
-    }
-}
 
 flutter {
     source '../..'

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()

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.7.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
+}
+
+include ":app"

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<KeyPadPage> {
         });
         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;

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';

lib/ttelectricMeter.dart

@@ -1,5 +1,4 @@
 // import 'package:ttlock_flutter/ttlock.dart';
-import 'dart:convert' as convert;
 
 import 'package:ttlock_flutter/ttlock.dart';
 

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);
+      }
     }
 
     //蓝牙水电表失败处理

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 =