From 25e6a906ded1ec9cc87786f9bb8be66216bbbc38 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Wed, 8 Jan 2025 11:52:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20google=20play=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=B8=85=E5=8D=95=E6=96=87=E4=BB=B6=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=97=E4=B8=BE=E7=94=B3=E8=AF=B7=E7=9B=B8=E5=90=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 8 -------- 1 file changed, 8 deletions(-) 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 @@ - - - - - - Date: Wed, 8 Jan 2025 14:58:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20umeng=20=E9=9A=90=E7=A7=81=E5=90=88?= =?UTF-8?q?=E8=A7=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/kotlin/com/skychip/lock/App.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/kotlin/com/skychip/lock/App.kt b/android/app/src/main/kotlin/com/skychip/lock/App.kt index 8da595db..fb6c753d 100755 --- a/android/app/src/main/kotlin/com/skychip/lock/App.kt +++ b/android/app/src/main/kotlin/com/skychip/lock/App.kt @@ -8,9 +8,9 @@ class App : FlutterApplication() { override fun onCreate() { super.onCreate() - UMConfigure.setLogEnabled(true); +// UMConfigure.setLogEnabled(true); //友盟预初始化 - UMConfigure.preInit(getApplicationContext(), "671244cf80464b33f6df9648", "Product"); +// UMConfigure.preInit(getApplicationContext(), "671244cf80464b33f6df9648", "Product"); Log.d("MyApplication", "Application has started") } } \ No newline at end of file From d099e81e92aadd3836b614737fab4f0382acd746 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Wed, 8 Jan 2025 17:19:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20umeng=20=E9=9A=90=E7=A7=81=E5=90=88?= =?UTF-8?q?=E8=A7=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' } From f21e49ae68c40e156d3725ca22562e3fcf62ef16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Wed, 8 Jan 2025 18:03:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E5=A4=8Dwifi?= =?UTF-8?q?=E9=94=81=E3=80=81=E7=BD=91=E5=85=B3=E9=85=8D=E7=BD=91=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E7=9A=84gatewayJson=E9=95=BF=E5=BA=A61=E5=AD=97?= =?UTF-8?q?=E8=8A=82=E6=94=B9=E4=B8=BA2=E5=AD=97=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/io_gateway/io_gateway_configuringWifi.dart | 9 ++++++++- lib/main_local.dart | 2 +- pubspec.yaml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) 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 30320b8d..ab615ff5 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' From cf5f23619dae62907da1ad8e816635742952e19c Mon Sep 17 00:00:00 2001 From: Liuyf Date: Wed, 8 Jan 2025 18:04:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20umeng=20=E9=9A=90=E7=A7=81=E5=90=88?= =?UTF-8?q?=E8=A7=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/skychip/lock/MainActivity.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt b/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt index 741b150f..c788ca3c 100755 --- a/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt +++ b/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt @@ -20,9 +20,12 @@ class MainActivity : FlutterActivity() { GeneratedPluginRegistrant.registerWith(flutterEngine!!) // 初始化 Umeng SDK - UMConfigure.init(this, "671244cf80464b33f6df9648", "Product", UMConfigure.DEVICE_TYPE_PHONE, null) +// UMConfigure.init(this, "671244cf80464b33f6df9648", "Product", UMConfigure.DEVICE_TYPE_PHONE, null) - 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"] @@ -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"]