sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop_liyi

Browse Source
This commit is contained in:
liyi 2025-01-08 18:16:45 +08:00
commit 7943aef0c2
7 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@ -304,6 +304,6 @@ dependencies {
implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3' implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3'
// Umeng统计 // Umeng统计
implementation 'com.umeng.umsdk:common:9.3.7' implementation 'com.umeng.umsdk:common:9.7.9'
implementation 'com.umeng.umsdk:asms:1.4.1' implementation 'com.umeng.umsdk:asms:1.8.5'
} }

8
android/app/src/main/AndroidManifest.xml
View File

@ -8,8 +8,6 @@
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />-->
<!--允许访问网络，必选权限--> <!--允许访问网络，必选权限-->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<!--允许获取精确位置，精准定位必选--> <!--允许获取精确位置，精准定位必选-->
@ -58,12 +56,6 @@
<uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" /> <uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<application <application
android:name=".App" android:name=".App"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

4
android/app/src/main/kotlin/com/skychip/lock/App.kt
View File

@ -8,9 +8,9 @@ class App : FlutterApplication() {
override fun onCreate() { override fun onCreate() {
super.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") Log.d("MyApplication", "Application has started")
} }
} }

19
android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt
View File

@ -20,9 +20,12 @@ class MainActivity : FlutterActivity() {
GeneratedPluginRegistrant.registerWith(flutterEngine!!) GeneratedPluginRegistrant.registerWith(flutterEngine!!)
// 初始化 Umeng SDK // 初始化 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") { if (call.method == "loadNativeShare") {
val map = call.arguments as Map<String, String> val map = call.arguments as Map<String, String>
val shareText = map["shareText"] val shareText = map["shareText"]
@ -32,7 +35,7 @@ class MainActivity : FlutterActivity() {
} else { } else {
shareText(shareText, "分享") shareText(shareText, "分享")
} }
} else if (call.method == "sendGetBlueStatus") { } else if (call.method == "sendGetBlueStatus") {
// 蓝牙是否开启 // 蓝牙是否开启
// println("收到原生的信息了 methodmethodmethod: ${call.method}") // println("收到原生的信息了 methodmethodmethod: ${call.method}")
val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter() val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter()
@ -50,7 +53,10 @@ class MainActivity : FlutterActivity() {
status = "-1" status = "-1"
} }
val flutterEngine: FlutterEngine? = this.flutterEngine // 获取你的 FlutterEngine 实例 val flutterEngine: FlutterEngine? = this.flutterEngine // 获取你的 FlutterEngine 实例
MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterReceive").invokeMethod("getBlueStatus", status) MethodChannel(
flutterEngine?.dartExecutor!!.binaryMessenger,
"starLockFlutterReceive"
).invokeMethod("getBlueStatus", status)
} else { } else {
result.notImplemented() // 没有实现的方法 result.notImplemented() // 没有实现的方法
} }
@ -96,7 +102,10 @@ class MainActivity : FlutterActivity() {
override fun configureFlutterEngine(flutterEngine: FlutterEngine) { override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine) GeneratedPluginRegistrant.registerWith(flutterEngine)
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result -> MethodChannel(
flutterEngine.dartExecutor.binaryMessenger,
"starLockFlutterSend"
).setMethodCallHandler { call, result ->
if (call.method == "loadNativeShare") { if (call.method == "loadNativeShare") {
val map = call.arguments as Map<String, String> val map = call.arguments as Map<String, String>
val shareText = map["shareText"] val shareText = map["shareText"]

9
lib/blue/io_gateway/io_gateway_configuringWifi.dart
View File

@ -1,6 +1,8 @@
// 网关配网 // 网关配网
import 'dart:convert'; import 'dart:convert';
import 'package:star_lock/app_settings/app_settings.dart';
import '../io_reply.dart'; import '../io_reply.dart';
import '../io_sender.dart'; import '../io_sender.dart';
import '../io_tool/io_tool.dart'; import '../io_tool/io_tool.dart';
@ -47,7 +49,12 @@ class GatewayConfiguringWifiCommand extends SenderProtocol {
//gatewayConfigurationStr //gatewayConfigurationStr
final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length; 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.addAll(utf8.encode(gatewayConfigurationStr!));
// subData = getFixedLengthList(subData, 20 - clientIdLength); // subData = getFixedLengthList(subData, 20 - clientIdLength);

2
lib/main_local.dart
View File

@ -4,7 +4,7 @@ import 'flavors.dart';
import 'main.dart' as runner; import 'main.dart' as runner;
Future<void> main() async { Future<void> main() async {
F.appFlavor = Flavor.sky_pre; F.appFlavor = Flavor.xhj_pre;
// AppLog.log('local调用了main函数'); // AppLog.log('local调用了main函数');
await runner.main(); await runner.main();
} }

2
pubspec.yaml
View File

@ -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+2024120301：完善网关功能
# 1.0.85+2024120401：修复网关问题，打包给谢敬调试 # 1.0.85+2024120401：修复网关问题，打包给谢敬调试
version: 1.0.85+2024123102 version: 1.0.85+2025010801
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'