zianxin/pj_supermarket_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:切换flutter版本

Browse Source
This commit is contained in:
dzc committed 2025-03-16 18:01:05 +08:00
1 parent ee761ccc48
commit 72443f7abf
32 files changed
+536 -375
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/common/routers/pages.dart
+9 -9
View File
@@ -21,15 +21,6 @@ class RoutePages {
Get.lazyPut(() => PanelController());
}),
),
GetPage(
name: RouteNames.supermarketProduct,
page: () => const SupermarketOrderPage(),
binding: BindingsBuilder(() {
Get.lazyPut(() => SelectPayTypeDialogController());
Get.lazyPut(() => PanelController());
Get.lazyPut(() => SupermarketOrderController());
}),
),
GetPage(
name: RouteNames.canteenProduct,
page: () => const CanteenProductPage(),
@@ -39,6 +30,15 @@ class RoutePages {
Get.lazyPut(() => PanelController());
}),
),
GetPage(
name: RouteNames.supermarketProduct,
page: () => const SupermarketOrderPage(),
binding: BindingsBuilder(() {
Get.lazyPut(() => SelectPayTypeDialogController());
Get.lazyPut(() => PanelController());
Get.lazyPut(() => SupermarketOrderController());
}),
),
GetPage(
name: RouteNames.takeFood,
page: () => const TakeFoodPage(),
lib/common/services/database/entity/classify_entity.dart
+8 -8
View File
@@ -14,28 +14,28 @@ class ClassifyEntity extends Equatable {
int? id;
/// 服务端唯一标识
String serviceUniqueCode;
final String serviceUniqueCode;
/// 平台类型
SysType sysType;
final SysType sysType;
/// 分类名
String name;
final String name;
/// 用餐类型，早餐、中餐、晚餐
String categoryType;
final String categoryType;
/// 排序 倒序排列
int sort;
final int sort;
/// 创建时间
DateTime createTime;
final DateTime createTime;
/// 同步时间
DateTime updateTime;
final DateTime updateTime;
/// 是否删除
bool delFlag;
final bool delFlag;
ClassifyEntity({
this.id,
lib/common/utils/app/app_setting_tool.dart
-2
View File
@@ -91,8 +91,6 @@ abstract class AppSettingTool {
}
static Future<void> setSysSetting(SysSetting sysInfo) async {
final globalSysInfo = await getSysSetting();
if (globalSysInfo == sysInfo) return;
await _setSetting(sysJson: sysInfo);
}
lib/common/utils/app/control/app_control.dart
+4 -3
View File
@@ -19,6 +19,7 @@ class AppControl extends GetxController {
/// mq
StreamSubscription? mqListen;
EventBus mqUpdateEventBus = EventBus();
/// 数据库
@@ -34,7 +35,7 @@ class AppControl extends GetxController {
serialCardManage.close();
srialSteelyardManage.close();
AppNetworkTool.closeListenNetwork();
// TtsManage.dispose();
TtsManage.dispose();
}
Future<void> initAsync() async {
@@ -43,8 +44,8 @@ class AppControl extends GetxController {
serialCardManage = SerialCardManage();
srialSteelyardManage = SerialSteelyardManage();
AppNetworkTool.listenNetwork();
// await AppFileTool.backupSqlFile();
// await TtsManage.initialize();
await AppFileTool.backupSqlFile();
await TtsManage.initialize();
Get.offAllNamed(RouteNames.login);
}
}
lib/common/utils/sync/sync_config_tool.dart
+6 -5
View File
@@ -8,25 +8,26 @@ abstract class SyncConfigTool {
static const _tag = "sync配置工具";
// 自动同步设备信息导本地缓存
static Future<void> autoSyncSysInfo() async {
static Future<SysSetting?> autoSyncSysInfo() async {
final login = await AppUserTool.isLogin();
if (!login) return;
if (!login) return null;
final sysSetting = await AppSettingTool.getSysSetting();
logger.i("|$_tag|开始同步设备信息 sysInfo:|${json.encode(sysSetting)}|");
if (ObjectUtil.isEmpty(sysSetting)) return;
if (ObjectUtil.isEmpty(sysSetting.serviceId)) return;
if (ObjectUtil.isEmpty(sysSetting)) return null;
if (ObjectUtil.isEmpty(sysSetting.serviceId)) return null;
final serviceId = sysSetting.serviceId;
final pa = {"id": serviceId};
final data = await HardApi.get(pa);
if (data == null) {
logger.e("|$_tag|同步设备信息错误serviceId:|$serviceId|;");
return;
return null;
}
// 基本信息
await AppSettingTool.updateSysInfoByService(data);
// 人脸sdk
await autoSyncFaceSdk(detail: data, sysInfo: sysSetting);
logger.i("|$_tag|结束同步设备信息 sysInfo:|${json.encode(sysSetting)}|");
return sysSetting;
}
// 自动同步设备信息导本地缓存-同步人脸sdk
lib/common/widgets/app/app_img.dart
+6 -38
View File
@@ -1,5 +1,6 @@
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:common_utils/common_utils.dart';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:flutter/material.dart';
@@ -15,31 +16,11 @@ Widget appNetworkImg(
double imgHeight = 60,
BoxFit fit = BoxFit.cover,
}) {
return Image.network(
src,
width: imgWidth,
height: imgHeight,
fit: fit,
loadingBuilder:
(BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {
if (loadingProgress == null) {
return child;
} else {
return Center(
child: SizedBox(
width: imgHeight,
height: imgHeight,
child: CircularProgressIndicator(
value: loadingProgress.expectedTotalBytes != null
? loadingProgress.cumulativeBytesLoaded /
(loadingProgress.expectedTotalBytes ?? 1)
: null,
),
),
);
}
},
errorBuilder: (BuildContext context, Object error, StackTrace? stackTrace) {
return CachedNetworkImage(
imageUrl: AppNetworkTool.ossImage(src),
placeholder: (context, url) =>
CircularProgressIndicator().width(50.w).height(50.w),
errorWidget: (context, url, error) {
final theme = FTheme.of(context);
return FIcon(
FAssets.icons.globeLock,
@@ -48,19 +29,6 @@ Widget appNetworkImg(
).width(imgWidth * 0.5).height(imgHeight * 0.5);
},
);
// return CachedNetworkImage(
// imageUrl: AppNetworkTool.ossImage(src),
// placeholder: (context, url) =>
// CircularProgressIndicator().width(50.w).height(50.w),
// errorWidget: (context, url, error) {
// final theme = FTheme.of(context);
// return FIcon(
// FAssets.icons.globeLock,
// color: theme.colorScheme.error,
// size: theme.typography.base.fontSize,
// ).width(imgWidth * 0.5).height(imgHeight * 0.5);
// },
// );
}
Widget appFileImg(
lib/common/widgets/order/mixin/order_mixin.dart
+6 -23
View File
@@ -14,9 +14,6 @@ mixin OrderMixin {
final appController = Get.find<AppControl>();
// 路由变化
StreamSubscription<GlobalRouter>? routerBus;
/// **************** start 需要重制 start ****************
// 时间类型
@@ -57,7 +54,7 @@ mixin OrderMixin {
);
// 当前的tab
RxInt currentTabIndex = RxInt(0);
int currentTabIndex = 0;
// 购买用户
Rxn<ServiceUser?> payUser = Rxn<ServiceUser>(null);
@@ -80,11 +77,12 @@ mixin OrderMixin {
// 点击分类tab
Future<void> doTab(int i) async {
if (currentTabIndex == i) return;
EasyLoading.show(
status: '切换中...',
maskType: EasyLoadingMaskType.black,
);
currentTabIndex.value = i;
currentTabIndex = i;
if (i <= classifyList.length - 1) {
final current = classifyList[i];
await getProduct(classifyCode: current.serviceUniqueCode);
@@ -113,12 +111,11 @@ mixin OrderMixin {
),
);
classifyList.value = list;
classifyList.refresh();
}
// 获取商品
Future<void> getProduct({
String classifyCode = "-1",
}) async {
Future<void> getProduct({String classifyCode = "-1"}) async {
final list = await appController.dataBase.getProductDao.getAll(
classifyCode,
hourType.value.code,
@@ -401,9 +398,7 @@ mixin OrderMixin {
/// **************** start 副屏幕相关 start ****************
void putOffSendSubScreen({
int seconds = 5,
}) {
void putOffSendSubScreen({int seconds = 5}) {
if (putOffSendSubScreenDelayed != null) {
sendSubScreen();
putOffSendSubScreenDelayed = null;
@@ -432,18 +427,6 @@ mixin OrderMixin {
/// **************** end 副屏幕相关 end ****************
/// **************** start 路由变化相关 start ****************
listenRouter() {
routerBus = GlobalRouteObserver.globalRouteObserverBus
.on<GlobalRouter>()
.listen((event) {
if (event.action == RouterActionType.didPop &&
event.name == RouteNames.faceDiscern) {}
});
}
/// **************** end 路由变化相关 end ****************
// 生成安卓唯一的code
Future<String> _getUniqueCode() async {
String code = "";
lib/common/widgets/order/order_common.dart
+36
View File
@@ -1,3 +1,5 @@
import 'dart:ffi';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:flutter/material.dart';
import 'package:forui/forui.dart';
@@ -148,3 +150,37 @@ Widget orderSelectPanel(
},
);
}
Widget orderRowClassify(
BuildContext context, {
required List<ClassifyEntity> classifyList,
required Function(int) onChange,
int currentTabIndex = 0,
}) {
final theme = FTheme.of(context);
return classifyList
.map((v) {
final target = classifyList[currentTabIndex];
final active = target.id == v.id;
return FButton(
style: active ? FButtonStyle.primary : FButtonStyle.secondary,
label: Text(
v.name,
textAlign: TextAlign.center,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.typography.xl.copyWith(
color: active
? theme.colorScheme.secondary
: theme.colorScheme.primary,
),
).center().width(120.w),
onPress: () {
final index = classifyList.indexWhere((i) => i.id == v.id);
onChange(index);
},
);
})
.toList()
.toRowSpace(space: 20.w);
}
lib/common/widgets/order/select_pay_type_dialog.dart
+32 -34
View File
@@ -12,6 +12,8 @@ import 'package:get/get.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
class SelectPayTypeDialogController extends GetxController {
SelectPayTypeDialogController();
/// **************** start 回调函数 start ****************
// |开始识别|的回调
@@ -114,16 +116,16 @@ class SelectPayTypeDialogController extends GetxController {
}
// |开始识别|点击
doRecognition() {
Future<void> doRecognition() async {
switch (orderPayDisplayType.value) {
case OrderPayDisplayType.qrCode:
_dispatchQrCode();
await _dispatchQrCode();
break;
case OrderPayDisplayType.walletCard:
_dispatchWalletCard();
await _dispatchWalletCard();
break;
case OrderPayDisplayType.face:
_dispatchFace();
await _dispatchFace();
break;
default:
}
@@ -143,7 +145,7 @@ class SelectPayTypeDialogController extends GetxController {
globalQrCode,
);
_closeStatus();
Navigator.of(Get.context!, rootNavigator: true).pop();
Navigator.of(Get.context!).pop();
}
// |取消|点击
@@ -151,18 +153,18 @@ class SelectPayTypeDialogController extends GetxController {
if (isRecognition.value) {
final flag = await appMessageDialog(Get.context!, "是否取消识别");
if (!flag) return;
Navigator.of(Get.context!, rootNavigator: true).pop();
Navigator.of(Get.context!).pop();
return;
}
_closeStatus();
onCancel?.call();
Navigator.of(Get.context!, rootNavigator: true).pop();
Navigator.of(Get.context!).pop();
}
// **************************************************************************
// 二维码识别 start
// **************************************************************************
void _dispatchQrCode() async {
Future<void> _dispatchQrCode() async {
try {
if (isRecognition.value) {
Toast.error(msg: "正在识别中,请勿重复点击");
@@ -229,7 +231,7 @@ class SelectPayTypeDialogController extends GetxController {
// **************************************************************************
// 饭卡识别 start
// **************************************************************************
void _dispatchWalletCard() async {
Future<void> _dispatchWalletCard() async {
if (isRecognition.value) {
Toast.error(msg: "正在识别中,请勿重复点击");
return;
@@ -302,9 +304,8 @@ class SelectPayTypeDialogController extends GetxController {
// **************************************************************************
// 人脸支付 start
// **************************************************************************
void _dispatchFace() async {
Future<void> _dispatchFace() async {
try {
EasyLoading.dismiss();
EasyLoading.show(
status: '人脸识别准备中...',
maskType: EasyLoadingMaskType.black,
@@ -312,13 +313,15 @@ class SelectPayTypeDialogController extends GetxController {
final faceDao = app.dataBase.getFaceDao;
final databaseFaceCount = await faceDao.findCount("-1");
if (databaseFaceCount == null || databaseFaceCount == 0) {
Toast.error(msg: "人脸数据库为空,请前往'设置'->'人脸管理'点击同步人脸");
throw Error();
String msg = "人脸数据库为空,请前往'设置'->'人脸管理'点击同步人脸";
Toast.error(msg: msg);
throw Exception(msg);
}
final isActive = await AppFaceTool.isActiveSdk();
if (!isActive) {
Toast.error(msg: "请检查激人脸sdk激活码");
throw Error();
String msg = "请检查激人脸sdk激活码";
Toast.error(msg: msg);
throw Exception(msg);
}
final faceCount = await FaceDiscernPlugs.getFaceCount();
if (faceCount == 0) {
@@ -326,8 +329,9 @@ class SelectPayTypeDialogController extends GetxController {
}
final isJump = await AppFaceTool.jumpFacePage();
if (!isJump) {
Toast.error(msg: "跳转到人脸检测页面失败");
throw Error();
String msg = "跳转到人脸检测页面失败";
Toast.error(msg: msg);
throw Exception(msg);
}
faceDiscernListen = FaceDiscernPlugs.faceStream.listen((event) {
if (event == null) return;
@@ -342,6 +346,7 @@ class SelectPayTypeDialogController extends GetxController {
SubScreenPlugin.doubleScreenShow();
});
} catch (e) {
logger.e("|$_tag|跳转人脸识别页面,意外的错误error:|$e|");
EasyLoading.dismiss();
}
}
@@ -418,12 +423,11 @@ class SelectPayTypeDialogController extends GetxController {
}
Future<void> selectPayTypeDialog() async {
final context = Get.context!;
final payTypeC = Get.find<SelectPayTypeDialogController>();
payTypeC.initPayType();
final theme = FTheme.of(context);
final width = context.width;
final height = context.height;
final theme = FTheme.of(Get.context!);
final width = Get.context!.width;
final height = Get.context!.height;
return showDialog(
context: Get.context!,
barrierDismissible: false,
@@ -467,14 +471,8 @@ Future<void> selectPayTypeDialog() async {
Obx(
() => Visibility(
visible: payTypeC.payUser.value == null,
replacement: selectPayTypeUser(
context,
payTypeC.payUser.value,
),
child: selectPayTypeHint(
context,
payTypeC.orderPayDisplayType.value,
),
replacement: selectPayTypeUser(payTypeC.payUser.value),
child: selectPayTypeHint(payTypeC.orderPayDisplayType.value),
),
).center().expanded(),
].toColumn().width(width * 0.5).height(height * 0.6),
@@ -518,8 +516,8 @@ Future<void> selectPayTypeDialog() async {
);
}
Widget selectPayTypeUser(BuildContext context, ServiceUser? user) {
final theme = FTheme.of(context);
Widget selectPayTypeUser(ServiceUser? user) {
final theme = FTheme.of(Get.context!);
if (user == null) return const SizedBox.shrink();
final isFree = user.walletIsFreeze ?? true;
final textStyle = theme.typography.xl;
@@ -545,7 +543,7 @@ Widget selectPayTypeUser(BuildContext context, ServiceUser? user) {
style: titleTheme,
prefixIcon: FIcon(FAssets.icons.badgeDollarSign),
title: Text('余额', style: textStyle),
details: appPrice(context, user.walletBalance),
details: appPrice(Get.context!, user.walletBalance),
),
FTile(
style: titleTheme,
@@ -564,8 +562,8 @@ Widget selectPayTypeUser(BuildContext context, ServiceUser? user) {
.height(double.infinity);
}
Widget selectPayTypeHint(BuildContext context, OrderPayDisplayType? type) {
final theme = FTheme.of(context);
Widget selectPayTypeHint(OrderPayDisplayType? type) {
final theme = FTheme.of(Get.context!);
if (type == null) return const SizedBox.shrink();
const baseMsg = "请点击开始识别按钮";
String msg = "";
lib/main.dart
+15 -14
View File
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:ui';
import 'package:flutter/material.dart';
@@ -8,10 +9,8 @@ import 'package:pj_supermarket_cloud/app.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
import 'package:pj_supermarket_cloud/sub_screen/page/index.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
DartPluginRegistrant.ensureInitialized();
await checkSubScreen();
void main() {
checkSubScreen();
}
Future<void> checkSubScreen() async {
@@ -19,19 +18,21 @@ Future<void> checkSubScreen() async {
case "/":
final appTheme = Get.put(AppThemeControl());
runApp(MainApp());
final app = Get.put(AppControl());
await app.initAsync();
await appTheme.initAsync();
await Future.microtask(() async {
final app = Get.put(AppControl());
await app.initAsync();
await appTheme.initAsync();
});
break;
case "subMain":
await Future(() async {
bool isMultipleScreen = await SubScreenPlugin.isMultipleScreen;
bool isOverlay = await SubScreenPlugin.checkOverlayPermission;
if (isMultipleScreen && isOverlay) {
SubScreenPlugin.doubleScreenShow();
}
WidgetsFlutterBinding.ensureInitialized();
DartPluginRegistrant.ensureInitialized();
bool isMultipleScreen = await SubScreenPlugin.isMultipleScreen;
bool isOverlay = await SubScreenPlugin.checkOverlayPermission;
if (isMultipleScreen && isOverlay) {
runApp(SubAppPage());
});
SubScreenPlugin.doubleScreenShow();
}
break;
}
}
lib/pages/canteen_product/controller.dart
+29 -49
View File
@@ -1,11 +1,10 @@
import 'dart:async';
import 'package:common_utils/common_utils.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_subscreen_plugin/flutter_subscreen_plugin.dart';
import 'package:forui/forui.dart';
import 'package:get/get.dart';
import 'package:forui/forui.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
class CanteenProductController extends GetxController with OrderMixin {
@@ -13,9 +12,7 @@ class CanteenProductController extends GetxController with OrderMixin {
static const _tag = "食堂购买页面";
final app = Get.find<AppControl>();
StreamSubscription? mqUpdateListen;
final appC = Get.find<AppControl>();
final hourTypeC = FRadioSelectGroupController<String>(
value: ProductHourType.MORNING.code,
@@ -27,42 +24,48 @@ class CanteenProductController extends GetxController with OrderMixin {
update(["canteen_product"]);
}
void onTap() {}
@override
void onInit() async {
super.onInit();
EasyLoading.dismiss();
await _initState();
}
@override
void onReady() {
super.onReady();
_initData();
}
@override
void onClose() {
super.onClose();
SubScreenPlugin.sendMsgToViceScreen(SubScreenAction.jumpSubBack.name);
// 读卡器
appC.serialCardManage.readerClose();
appC.serialCardManage.close();
hourTypeC.dispose();
}
Future<void> _initState() async {
EasyLoading.show(
status: '初始化资源...',
maskType: EasyLoadingMaskType.black,
);
appSetting = await AppSettingTool.getSysSetting();
// 打开副屏
SubScreenPlugin.doubleScreenShow();
SubScreenPlugin.sendMsgToViceScreen(SubScreenAction.jumpSubPage.name);
/// **************** start 组件初始化 start ****************
// 组件初始化
hourType.value = appSetting.hourType ?? ProductHourType.MORNING;
hourTypeC.value = {hourType.value.code};
sysType = SysType.CANTEEN;
_listenPayTypeSelectCallback();
/// **************** end 组件初始化 end ****************
/// **************** start 获取分类和商品 start ****************
// 获取分类和商品
await getClassify();
await getProduct();
/// **************** end 获取分类和商品 end ****************
// 清空购物车
await _clearShopCard();
EasyLoading.dismiss();
// 监听时间段选择
hourTypeC.addValueListener((v) async {
final currentHourType = ProductHourType.values.fromCode(
v.first,
@@ -84,32 +87,13 @@ class CanteenProductController extends GetxController with OrderMixin {
});
}
@override
void onReady() {
super.onReady();
_initData();
}
@override
void onClose() {
super.onClose();
SubScreenPlugin.sendMsgToViceScreen(SubScreenAction.jumpSubBack.name);
// 读卡器
app.serialCardManage.readerClose();
app.serialCardManage.close();
// 路由监听
routerBus?.cancel();
mqUpdateListen?.cancel();
hourTypeC.dispose();
}
// |下单|点击购买
Future<void> doPay() async {
final validShopCar = _validateShopCar();
if (!validShopCar) return;
// 创建本地订单
await createSqlOrder();
await selectPayTypeDialog();
selectPayTypeDialog();
}
// |下单|点击取消下单
@@ -131,7 +115,6 @@ class CanteenProductController extends GetxController with OrderMixin {
return e.productServiceUniqueCode == current.productServiceUniqueCode;
});
}
shopCardList.refresh();
computedTotalPrice();
await _computedAmountMealPrice();
sendSubScreen();
@@ -162,7 +145,6 @@ class CanteenProductController extends GetxController with OrderMixin {
target.productNumber,
);
}
shopCardList.refresh();
computedTotalPrice();
await _computedAmountMealPrice();
sendSubScreen();
@@ -194,7 +176,6 @@ class CanteenProductController extends GetxController with OrderMixin {
this.orderPayDisplayType.value = orderPayDisplayType;
this.globalQrCode = qrCode;
payUser.value = user;
payUser.refresh();
final validPayUser = _validatePayUser();
if (!validPayUser) return;
final validShopCar = _validateShopCar();
@@ -265,9 +246,8 @@ class CanteenProductController extends GetxController with OrderMixin {
// 获取默认商品
Future<void> _getDefaultProduct() async {
final appSetting = await AppSettingTool.getSysSetting();
final sysType = appSetting.sysType.name;
final productDao = app.dataBase.getProductDao;
final productDao = appC.dataBase.getProductDao;
List<ProductEntity> list = await productDao.getDefault(
sysType,
hourType.value.code,
lib/pages/canteen_product/view.dart
+66 -95
View File
@@ -1,8 +1,10 @@
import 'package:common_utils/common_utils.dart';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:flutter/material.dart';
import 'package:forui/forui.dart';
import 'package:common_utils/common_utils.dart';
import 'package:get/get.dart';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:forui/forui.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
import 'index.dart';
@@ -11,71 +13,33 @@ class CanteenProductPage extends GetView<CanteenProductController> {
const CanteenProductPage({super.key});
// 头部
Widget _buildHeader(BuildContext context, double headerHeight) {
Widget _buildHeader(double headerHeight) {
final context = Get.context!;
final theme = FTheme.of(context);
return <Widget>[
FIcon(
FAssets.icons.chevronLeft,
size: theme.typography.xl4.fontSize,
).alignLeft().width(headerHeight).onTap(() => Get.back()),
Obx(() => controller.classifyList
.map(
(v) {
final currentIndex = controller.currentTabIndex.value;
final target = controller.classifyList[currentIndex];
final active = target.id == v.id;
return FButton(
style:
active ? FButtonStyle.primary : FButtonStyle.secondary,
label: Text(
v.name,
textAlign: TextAlign.center,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.typography.xl.copyWith(
color: active
? theme.colorScheme.secondary
: theme.colorScheme.primary,
),
).center().width(120.w),
onPress: () => controller.doTab(
controller.classifyList.indexWhere((i) => i.id == v.id),
),
);
},
)
.toList()
.toRowSpace(space: 20.w))
.scrollable(scrollDirection: Axis.horizontal)
.expanded(),
appRadioHourTypeDialog(
context,
controller.hourTypeC,
).width(300.w),
].toRow();
}
// 主体部分
Widget _buildMain(BuildContext context) {
final width = context.width;
final theme = FTheme.of(context);
return <Widget>[
_buildProduct(context).expanded(),
SizedBox(width: 15.w),
_buildUser(context).width(width * 0.25).decorated(
border: Border.all(
color: theme.colorScheme.primary,
width: 1,
),
borderRadius: theme.style.borderRadius,
),
)
.alignLeft()
.width(headerHeight)
.onTap(() => Get.offAndToNamed(RouteNames.panel)),
Obx(
() => orderRowClassify(
context,
classifyList: controller.classifyList,
currentTabIndex: controller.currentTabIndex,
onChange: (tabIndex) => controller.doTab(tabIndex),
),
).scrollable(scrollDirection: Axis.horizontal).expanded(),
appRadioHourTypeDialog(context, controller.hourTypeC).width(300.w),
].toRow();
}
// 商品
Widget _buildProduct(BuildContext context) {
Widget _buildProduct() {
return LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
builder: (BuildContext _, BoxConstraints constraints) {
const spacing = 10;
const runSpacing = 10;
double maxHeight = constraints.maxHeight;
@@ -166,31 +130,31 @@ class CanteenProductPage extends GetView<CanteenProductController> {
}
// 用户信息
Widget _buildUser(BuildContext context) {
final theme = FTheme.of(context);
Widget _buildUser() {
final theme = FTheme.of(Get.context!);
return <Widget>[
<Widget>[
Obx(() {
final payUser = controller.payUser.value;
return appUserInfo(
context,
Get.context!,
username: payUser?.username,
balance: payUser?.walletBalance,
avatar: payUser?.userAvatar,
);
}).width(400.w),
].toRow(mainAxisAlignment: MainAxisAlignment.center),
SizedBox(height: 10.h),
FDivider(
style: theme.dividerStyles.verticalStyle.copyWith(
color: theme.colorScheme.primary,
padding: EdgeInsets.zero,
}).width(400.w).center(),
SizedBox(height: 10.h),
FDivider(
style: theme.dividerStyles.verticalStyle.copyWith(
color: theme.colorScheme.primary,
padding: EdgeInsets.zero,
),
),
),
Text(
"已点菜品",
style: theme.typography.xl2,
).alignLeft(),
Text(
"已点菜品",
style: theme.typography.xl2,
).alignLeft(),
].toColumn(),
Obx(
() => ListView.builder(
padding: EdgeInsets.zero,
@@ -198,7 +162,7 @@ class CanteenProductPage extends GetView<CanteenProductController> {
itemBuilder: (context, index) {
final current = controller.shopCardList[index];
return orderSelectPanel(
context,
Get.context!,
label: current.productName,
price: current.productPrice,
total: current.productNumber,
@@ -209,14 +173,14 @@ class CanteenProductPage extends GetView<CanteenProductController> {
},
),
).expanded(),
Obx(
() => orderAllPrice(
context,
totalPrice: controller.totalPrice.value,
amountMealPrice: controller.amountMealPrice.value,
),
),
<Widget>[
Obx(
() => orderAllPrice(
Get.context!,
totalPrice: controller.totalPrice.value,
amountMealPrice: controller.amountMealPrice.value,
),
),
SizedBox(height: 20.h),
<Widget>[
FButton(
@@ -245,29 +209,36 @@ class CanteenProductPage extends GetView<CanteenProductController> {
}
// 主视图
Widget _buildView(BuildContext context) {
Widget _buildView() {
final context = Get.context!;
final width = context.width;
final theme = FTheme.of(context);
return <Widget>[
_buildMain(context).marginOnly(bottom: 20.h).expanded(),
].toColumn();
_buildProduct().expanded(),
SizedBox(width: 15.w),
_buildUser().width(width * 0.25).decorated(
border: Border.all(
color: theme.colorScheme.primary,
width: 1,
),
borderRadius: theme.style.borderRadius,
),
].toRow().marginOnly(bottom: 20.h);
}
@override
Widget build(BuildContext context) {
final height = context.height;
final headerHeight = height * 0.08;
final height = 90;
return GetBuilder<CanteenProductController>(
init: CanteenProductController(),
init: Get.find<CanteenProductController>(),
id: "canteen_product",
builder: (_) {
return FScaffold(
header: _buildHeader(
context,
headerHeight,
)
.height(headerHeight)
.padding(vertical: 30.h, horizontal: 10.w)
.decorated(),
content: _buildView(context),
header: _buildHeader(height.h)
.height(height.h)
.padding(vertical: 30.h, horizontal: 10.w),
content: _buildView(),
contentPad: true,
resizeToAvoidBottomInset: false,
);
},
lib/pages/panel/controller.dart
+11 -6
View File
@@ -11,7 +11,7 @@ class PanelController extends GetxController {
RxList<PanelItem> panelBtnList = <PanelItem>[
PanelItem(title: "购买", visible: false, type: PanelType.supermarketOrder),
PanelItem(title: "点餐", visible: false, type: PanelType.canteenOrder),
PanelItem(title: "取餐", visible: true, type: PanelType.takeFood),
PanelItem(title: "取餐", visible: false, type: PanelType.takeFood),
PanelItem(title: "交易查询", visible: true, type: PanelType.orderHistory),
PanelItem(title: "开卡管理", visible: true, type: PanelType.cardActive),
PanelItem(title: "设置", visible: true, type: PanelType.setting),
@@ -21,15 +21,17 @@ class PanelController extends GetxController {
final canteenMenus = [
PanelType.canteenOrder,
PanelType.takeFood,
];
final supermarketMenus = [
PanelType.supermarketOrder,
];
_initData() async {
@override
void onInit() async {
super.onInit();
await _updateMenus();
update(["panel"]);
}
@override
@@ -38,15 +40,19 @@ class PanelController extends GetxController {
_initData();
}
_initData() async {
update(["panel"]);
}
Future<void> doBtn(PanelType type) async {
switch (type) {
case PanelType.supermarketOrder:
if (!await _checkIsBind()) return;
Get.toNamed(RouteNames.supermarketProduct);
Get.offAllNamed(RouteNames.supermarketProduct);
break;
case PanelType.canteenOrder:
if (!await _checkIsBind()) return;
Get.toNamed(RouteNames.canteenProduct);
Get.offAllNamed(RouteNames.canteenProduct);
break;
case PanelType.takeFood:
if (!await _checkIsBind()) return;
@@ -75,7 +81,6 @@ class PanelController extends GetxController {
Get.offAndToNamed(RouteNames.login);
break;
case PanelType.test:
await AppFaceTool.jumpFacePage();
break;
default:
break;
lib/pages/setting/controller.dart
+3 -1
View File
@@ -87,6 +87,7 @@ class SettingController extends GetxController {
if (payType == null) continue;
usePayList.add(payType);
}
usePayList.sort((pren, next) => pren.code.compareTo(next.code));
sysSetting.value?.usePayDisplayType = usePayList;
await AppSettingTool.setSysSetting(sysSetting.value!);
});
@@ -131,7 +132,8 @@ class SettingController extends GetxController {
maskType: EasyLoadingMaskType.black,
);
try {
await SyncConfigTool.autoSyncSysInfo();
final setting = await SyncConfigTool.autoSyncSysInfo();
if (setting != null) sysSetting.value = setting;
Toast.success(msg: "同步设备信息成功");
EasyLoading.dismiss();
} catch (e, stack) {
lib/pages/setting/widgets/setting_baseInfo.dart
+2 -2
View File
@@ -16,9 +16,9 @@ Future<void> _bindServiceDialog(BuildContext context, SysSetting sys) async {
uniqueCodeC.text = sys.serviceId ?? "";
} else if (AppSysTool.isDev()) {
// 超市
uniqueCodeC.text = "1894303392833716226";
// uniqueCodeC.text = "1894303392833716226";
// 测试
// uniqueCodeC.text = "1896157295523049473";
uniqueCodeC.text = "1896157295523049473";
}
await showAdaptiveDialog(
context: context,
lib/pages/supermarket_order/controller.dart
+11 -9
View File
@@ -1,6 +1,8 @@
import 'package:get/get.dart';
class SupermarketOrderController extends GetxController {
import 'package:pj_supermarket_cloud/common/index.dart';
class SupermarketOrderController extends GetxController with OrderMixin {
SupermarketOrderController();
_initData() {
@@ -9,10 +11,10 @@ class SupermarketOrderController extends GetxController {
void onTap() {}
// @override
// void onInit() {
// super.onInit();
// }
@override
void onInit() {
super.onInit();
}
@override
void onReady() {
@@ -20,8 +22,8 @@ class SupermarketOrderController extends GetxController {
_initData();
}
// @override
// void onClose() {
// super.onClose();
// }
@override
void onClose() {
super.onClose();
}
}
lib/pages/supermarket_order/view.dart
+30 -14
View File
@@ -3,11 +3,36 @@ import 'package:flutter/material.dart';
import 'package:forui/forui.dart';
import 'package:get/get.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
import 'index.dart';
class SupermarketOrderPage extends GetView<SupermarketOrderController> {
const SupermarketOrderPage({super.key});
// 头部
Widget _buildHeader(double headerHeight) {
final context = Get.context!;
final theme = FTheme.of(context);
return <Widget>[
FIcon(
FAssets.icons.chevronLeft,
size: theme.typography.xl4.fontSize,
)
.alignLeft()
.width(headerHeight)
.onTap(() => Get.offAndToNamed(RouteNames.panel)),
Obx(
() => orderRowClassify(
context,
classifyList: controller.classifyList,
currentTabIndex: controller.currentTabIndex,
onChange: (tabIndex) => controller.doTab(tabIndex),
),
).scrollable(scrollDirection: Axis.horizontal).expanded(),
].toRow();
}
// 主视图
Widget _buildView(BuildContext context) {
return const Center(
@@ -17,26 +42,17 @@ class SupermarketOrderPage extends GetView<SupermarketOrderController> {
@override
Widget build(BuildContext context) {
final theme = FTheme.of(context);
final height = context.height;
final height = 90;
return GetBuilder<SupermarketOrderController>(
init: SupermarketOrderController(),
id: "supermarket_order",
builder: (_) {
return FScaffold(
header: FHeader.nested(
title: Text("取餐"),
prefixActions: [
FHeaderAction.back(onPress: Get.back),
],
style: theme.headerStyle.nestedStyle.copyWith(
titleTextStyle: theme.typography.lg,
actionStyle: theme.headerStyle.nestedStyle.actionStyle.copyWith(
size: theme.typography.xl2.fontSize,
),
),
).height(height * 0.1),
header: _buildHeader(height.h)
.height(height.h)
.padding(vertical: 30.h, horizontal: 10.w),
content: _buildView(context),
contentPad: true,
resizeToAvoidBottomInset: false,
);
},
lib/sub_screen/page/sub_app.dart
+4 -8
View File
@@ -1,9 +1,9 @@
import 'dart:async';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
// import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:flutter/material.dart';
import 'package:flutter_subscreen_plugin/flutter_subscreen_plugin.dart';
import 'package:forui/forui.dart';
// import 'package:forui/forui.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
import 'package:pj_supermarket_cloud/sub_screen/page/index.dart';
@@ -37,7 +37,6 @@ class _SubAppPageState extends State<SubAppPage> {
@override
Widget build(BuildContext context) {
final theme = FTheme.of(context);
return MaterialApp(
navigatorKey: SubNavigatorKey.navigatorKey,
debugShowCheckedModeBanner: false,
@@ -45,11 +44,8 @@ class _SubAppPageState extends State<SubAppPage> {
SubRouteNames.subProduct: (context) => const SubProductPage(),
},
home: Scaffold(
backgroundColor: theme.colorScheme.background,
body: Text(
'欢迎使用',
style: theme.typography.xl4,
).center(),
backgroundColor: Colors.white,
body: Text('欢迎使用'),
),
);
}
lib/sub_screen/page/sub_product.dart
+8 -8
View File
@@ -1,10 +1,8 @@
import 'dart:async';
import 'package:flutter/widgets.dart';
import 'package:flutter/material.dart';
import 'package:flutter_subscreen_plugin/flutter_subscreen_plugin.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
class SubProductPage extends StatefulWidget {
const SubProductPage({super.key});
@@ -19,10 +17,10 @@ class _SubProductPageState extends State<SubProductPage> {
void initState() {
super.initState();
_streamSubscription = SubScreenPlugin.viceStream.listen((event) {
dynamic params = event.arguments;
final action = SubScreenAction.values.fromCode(event.method);
if (action == null) return;
if (action == SubScreenAction.updateCard) {}
// dynamic params = event.arguments;
// final action = SubScreenAction.values.fromCode(event.method);
// if (action == null) return;
// if (action == SubScreenAction.updateCard) {}
});
}
@@ -34,6 +32,8 @@ class _SubProductPageState extends State<SubProductPage> {
@override
Widget build(BuildContext context) {
return Container();
return Container(
color: Colors.white,
);
}
}