diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d9aea6d..baeb56c7 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -304,6 +304,6 @@ dependencies { implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3' // Umeng统计 - implementation 'com.umeng.umsdk:common:9.3.7' - implementation 'com.umeng.umsdk:asms:1.4.1' + implementation 'com.umeng.umsdk:common:9.7.9' + implementation 'com.umeng.umsdk:asms:1.8.5' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 19e5a231..5bc305cb 100755 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -8,8 +8,6 @@ - - @@ -58,12 +56,6 @@ - - - - - - + MethodChannel( + flutterEngine?.dartExecutor!!.binaryMessenger, + "starLockFlutterSend" + ).setMethodCallHandler { call, result -> if (call.method == "loadNativeShare") { val map = call.arguments as Map val shareText = map["shareText"] @@ -32,7 +35,7 @@ class MainActivity : FlutterActivity() { } else { shareText(shareText, "分享") } - } else if (call.method == "sendGetBlueStatus") { + } else if (call.method == "sendGetBlueStatus") { // 蓝牙是否开启 // println("收到原生的信息了 methodmethodmethod: ${call.method}") val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter() @@ -50,7 +53,10 @@ class MainActivity : FlutterActivity() { status = "-1" } val flutterEngine: FlutterEngine? = this.flutterEngine // 获取你的 FlutterEngine 实例 - MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterReceive").invokeMethod("getBlueStatus", status) + MethodChannel( + flutterEngine?.dartExecutor!!.binaryMessenger, + "starLockFlutterReceive" + ).invokeMethod("getBlueStatus", status) } else { result.notImplemented() // 没有实现的方法 } @@ -96,7 +102,10 @@ class MainActivity : FlutterActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result -> + MethodChannel( + flutterEngine.dartExecutor.binaryMessenger, + "starLockFlutterSend" + ).setMethodCallHandler { call, result -> if (call.method == "loadNativeShare") { val map = call.arguments as Map val shareText = map["shareText"] diff --git a/lib/blue/io_gateway/io_gateway_configuringWifi.dart b/lib/blue/io_gateway/io_gateway_configuringWifi.dart index 9708c6bf..7d6a5ede 100644 --- a/lib/blue/io_gateway/io_gateway_configuringWifi.dart +++ b/lib/blue/io_gateway/io_gateway_configuringWifi.dart @@ -1,6 +1,8 @@ // 网关配网 import 'dart:convert'; +import 'package:star_lock/app_settings/app_settings.dart'; + import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -47,7 +49,12 @@ class GatewayConfiguringWifiCommand extends SenderProtocol { //gatewayConfigurationStr final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length; - subData.add(clientIdLength); + final double clientIdLengthDouble = clientIdLength / 256; + final int clientIdLengthDoubleType1 = clientIdLengthDouble.toInt(); + final int clientIdLengthDoubleType2 = clientIdLength % 256; + // AppLog.log('gatewayConfigurationStr!:$gatewayConfigurationStr! clientIdLength:$clientIdLength clientIdLengthDouble:$clientIdLengthDouble clientIdLengthDoubleType1:$clientIdLengthDoubleType1 clientIdLengthDoubleType2:$clientIdLengthDoubleType2'); + data.add(clientIdLengthDoubleType1); + data.add(clientIdLengthDoubleType2); subData.addAll(utf8.encode(gatewayConfigurationStr!)); // subData = getFixedLengthList(subData, 20 - clientIdLength); diff --git a/lib/main_local.dart b/lib/main_local.dart index ca85c5fa..f56b6d65 100755 --- a/lib/main_local.dart +++ b/lib/main_local.dart @@ -4,7 +4,7 @@ import 'flavors.dart'; import 'main.dart' as runner; Future main() async { - F.appFlavor = Flavor.sky_pre; + F.appFlavor = Flavor.xhj_pre; // AppLog.log('local调用了main函数'); await runner.main(); } diff --git a/pubspec.yaml b/pubspec.yaml index ce27ae02..46f69f29 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -104,7 +104,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.85+2024120301:完善网关功能 # 1.0.85+2024120401:修复网关问题,打包给谢敬调试 -version: 1.0.85+2024123102 +version: 1.0.85+2025010801 environment: sdk: '>=2.12.0 <3.0.0'