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

解决冲突

Browse Source
This commit is contained in:
魏少阳 2024-02-01 11:25:57 +08:00
parent 361162414b
commit 5ba73c2c90
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
View File

@ -19,7 +19,6 @@ class XSConstantMacro {
static int keyTypeOnce = 3; static int keyTypeOnce = 3;
static int keyTypeLoop = 4; static int keyTypeLoop = 4;
<<<<<<< HEAD
// "110401" 正常使用 // "110401" 正常使用
// "110402" 待接收 // "110402" 待接收
// "110403" 待生效 // "110403" 待生效
@ -55,12 +54,10 @@ class XSConstantMacro {
return "未知"; return "未知";
} }
} }
=======
// 门锁事件类型 lockEventType 事件类型：0-全部事件；10-开门事件20-异常事件30-门铃事件40-视频事件 // 门锁事件类型 lockEventType 事件类型：0-全部事件；10-开门事件20-异常事件30-门铃事件40-视频事件
static int lockEventTypeAll = 0; static int lockEventTypeAll = 0;
static int lockEventTypeOpenDoor = 10; static int lockEventTypeOpenDoor = 10;
static int lockEventTypeAbnormal = 20; static int lockEventTypeAbnormal = 20;
static int lockEventTypeDoorbell = 30; static int lockEventTypeDoorbell = 30;
static int lockEventTypeVideo = 40; static int lockEventTypeVideo = 40;
>>>>>>> 3a8faadfc9fb60336af1b9ad2319bd9f1c70c714
} }