Merge branch 'master_hyx'

This commit is contained in:
ante 2024-04-10 18:15:49 +08:00
commit 7d3bfcf1ff

View File

@ -35,26 +35,9 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.doorLockLog!.tr,
barTitle: TranslationLoader.lanKeys!.operatingRecord!.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: [
IconButton(
icon: Image.asset(
'images/icon_bar_more.png',
height: 30.h,
width: 10.w,
),
onPressed: () async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
} else {
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},
),
],
),
body: Column(
mainAxisSize: MainAxisSize.max,
@ -68,7 +51,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
endIndent: 30.w,
),
eventDropDownWidget(),
Expanded(child: Obx(() => timeLineView(state.lockLogItemList.value)))
Expanded(child: Obx(() => timeLineView(state.lockLogItemList)))
],
),
);