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

Merge branch 'canary_release' into develop_liyi

Browse Source
This commit is contained in:
Liuyf 2025-03-31 18:59:11 +08:00
commit faa5deec84
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/blue/io_reply.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -39,7 +38,7 @@ abstract class Reply{
case 0x04: case 0x04:
// 用户未登记 // 用户未登记
AppLog.log('$logTag ${commandType!.typeName} 0x04 用户未登记'); AppLog.log('$logTag ${commandType!.typeName} 0x04 用户未登记');
// showErrorMessage('用户未登记'); showErrorMessage('用户未登记'.tr);
break; break;
case 0x05: case 0x05:
// 参数错误 // 参数错误

6
lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -1262,8 +1262,6 @@ class _LockDetailPageState extends State<LockDetailPage>
SizedBox( SizedBox(
width: 42.w, width: 42.w,
height: 42.h, height: 42.h,
child: FlavorsImg(
black: true,
child: Image.asset(iconUrl, child: Image.asset(iconUrl,
width: 42.w, width: 42.w,
height: 42.w, height: 42.w,
@ -1272,7 +1270,6 @@ class _LockDetailPageState extends State<LockDetailPage>
: AppColors.lockDetailBottomBtnUneable, : AppColors.lockDetailBottomBtnUneable,
fit: BoxFit.fitWidth), fit: BoxFit.fitWidth),
), ),
),
SizedBox(height: 5.h), SizedBox(height: 5.h),
Expanded( Expanded(
child: Text(name, child: Text(name,
@ -1295,8 +1292,6 @@ class _LockDetailPageState extends State<LockDetailPage>
SizedBox( SizedBox(
width: 42.w, width: 42.w,
height: 42.w, height: 42.w,
child: FlavorsImg(
black: true,
child: Image.asset(iconUrl, child: Image.asset(iconUrl,
width: 42.w, width: 42.w,
height: 42.w, height: 42.w,
@ -1305,7 +1300,6 @@ class _LockDetailPageState extends State<LockDetailPage>
: AppColors.lockDetailBottomBtnUneable, : AppColors.lockDetailBottomBtnUneable,
fit: BoxFit.fitWidth), fit: BoxFit.fitWidth),
), ),
),
SizedBox(height: 15.h), SizedBox(height: 15.h),
Text( Text(
name, name,

3
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -362,7 +362,8 @@ class _LockSetPageState extends State<LockSetPage>
//todo: 双重认证、双锁联动国际化、API接口 //todo: 双重认证、双锁联动国际化、API接口
//双重认证 //双重认证
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.doubleAuthentication == 1, //state.lockFeature.value.doubleAuthentication == 1,
visible: false,
child: CommonItem( child: CommonItem(
leftTitel: '双重认证'.tr, leftTitel: '双重认证'.tr,
rightTitle: '', rightTitle: '',

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; F.appFlavor = Flavor.xhj;
// AppLog.log('local调用了main函数'); // AppLog.log('local调用了main函数');
await runner.main(); await runner.main();
} }