hermes-agent/flutter_wisetronic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phase3: FIX arg-bang regex (missing \] in char class skipped subscripts). 235->183

Browse Source
This commit is contained in:
peima
2026-07-31 14:57:23 +08:00
parent 70076d71c1
commit 18abf4eb82
15 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/widgets/desktop/desktop_checkout.dart
View File

@@ -757,7 +757,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
subtotal = 0.0;
for (var i = 0; i < cartInfo!.productList!.length; i++) {
subtotal += cartInfo!.productList![i].totalPrice;
subtotal += cartInfo!.productList![i].totalPrice!;
column.children.add(lineItem(cartInfo!.productList![i]));
}
column.children.add(GestureDetector(
@@ -863,7 +863,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
Container(
alignment: Alignment.centerRight,
child: Text(
S.of(context).extra_fee_token(cartInfo!.extraFeeList![i].name, cartInfo!.extraFeeList![i].rate),
S.of(context).extra_fee_token(cartInfo!.extraFeeList![i].name!, cartInfo!.extraFeeList![i].rate!),
style: TextStyle(
color: Colors.grey,
),
@@ -1342,7 +1342,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
child: Container(
padding: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0, bottom: 12.0),
child: Text(
bookingDateTime.bookTimes![position].viewTime,
bookingDateTime.bookTimes![position].viewTime!,
),
decoration: BoxDecoration(
border: Border(
@@ -1581,7 +1581,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
for (var i = 0; i < coupons!.length; i++) {
if (selectedCoupon == coupons![i].id) {
if (coupons![i].isPercentage == true) {
return S.of(context).percentage_discount_token2(couponDiscountAmount.toStringAsFixed(2), coupons![i].valueAmount);
return S.of(context).percentage_discount_token2(couponDiscountAmount.toStringAsFixed(2), coupons![i].valueAmount!);
} else {
return S.of(context).discount_amount_token(couponDiscountAmount.toStringAsFixed(2));
}
@@ -1957,7 +1957,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
),
));
for (int i = 0; i < cartInfo!.businessInfo!.quickInputs!.length; i++) {
String qi = cartInfo!.businessInfo!.quickInputs![i].value;
String qi = cartInfo!.businessInfo!.quickInputs![i].value!;
w.children.add(TextButton(
child: Text(
qi,

2
lib/widgets/desktop/desktop_orders.dart
View File

@@ -181,7 +181,7 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
row.children.add(Expanded(
child: Container(
child: Text(
order!.cartInfo!.productList![0].name,
order!.cartInfo!.productList![0].name!,
style: TextStyle(
fontSize: 14.0,
),

2
lib/widgets/desktop/desktop_product_detail_page.dart
View File

@@ -455,7 +455,7 @@ class DesktopProductDetailPageState extends State<DesktopProductDetailPage>
images.add(productDetail.image!);
for (var i = 0; i < productDetail.images!.length; i++) {
// print('>>https:' + productDetail.images[i].image);
images.add(productDetail.images![i].image);
images.add(productDetail.images![i].image!);
}
for (var i = 0; i < images.length; i++) {

2
lib/widgets/desktop/shop.dart
View File

@@ -223,7 +223,7 @@ class ShopState extends State<Shop> {
.map((i) => CategoryProducts.fromJson(i))
.toList();
if (categoryId == 0 && displayProductByCategoryClick) {
categoryId = _categoryProducts[0].id;
categoryId = _categoryProducts[0].id!;
}
data = value;
});

2
lib/widgets/desktop/shop_products.dart
View File

@@ -347,7 +347,7 @@ class ShopProductsState extends State<ShopProducts> {
}
displayProductByCategoryClickIndicator = '';
if (categoryId == 0 && displayProductByCategoryClick) {
categoryId = _categoryProducts[0].id;
categoryId = _categoryProducts[0].id!;
}
setState(() {

6
lib/widgets/desktop/shop_promote.dart
View File

@@ -129,7 +129,7 @@ class ShopPromoteState extends State<ShopPromote> {
GestureDetector(
child: Container(
child: Util.showImage(
_business.promoProducts![i].imagePath,
_business.promoProducts![i].imagePath!,
width: 120.0,
),
),
@@ -139,7 +139,7 @@ class ShopPromoteState extends State<ShopPromote> {
),
Container(
child: Text(
_business.promoProducts![i].name,
_business.promoProducts![i].name!,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 14.0),
@@ -149,7 +149,7 @@ class ShopPromoteState extends State<ShopPromote> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ShowPrice(
_business.promoProducts![i].price,
_business.promoProducts![i].price!,
currencySign: '\$',
fontWeight: FontWeight.bold,
smallFontSize: 15,

2
lib/widgets/general/add_remove_button.dart
View File

@@ -380,7 +380,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
void _removeCartLineItem() {
if (cartInfo.productList![widget.cartLineItemIndex].quantity! <= 1) {
String uuid = cartInfo.productList![widget.cartLineItemIndex].uuid;
String uuid = cartInfo.productList![widget.cartLineItemIndex].uuid!;
cartInfo.productList!.removeAt(widget.cartLineItemIndex);
Utils.removeSubproduct(cartInfo, uuid);
} else {

18
lib/widgets/general/attribute/check_options.dart
View File

@@ -50,7 +50,7 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
new Text(
S.of(context).check_option_select_token(product.productAttributes![this.index].name),
S.of(context).check_option_select_token(product.productAttributes![this.index].name!),
style: new TextStyle(
fontSize: 12.5,
),
@@ -95,7 +95,7 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
'adjust_amount': adjustAmount
};
var cloneSelections = json.decode(json.encode(selections));
int idx = Utils.selectionsContains(cloneSelections, product.productAttributes![index].name, name);
int idx = Utils.selectionsContains(cloneSelections, product.productAttributes![index].name!, name);
if (idx != -1) {
(cloneSelections[product.productAttributes![index].name!.toUpperCase()] as List).removeAt(idx);
} else if (cloneSelections.containsKey(product.productAttributes![index].name!.toUpperCase())) {
@@ -108,7 +108,7 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
cloneSelections.remove(product.productAttributes![index].name!.toUpperCase());
}
setOptionsStateDisabled(product.productAttributes![index].name, false);
setOptionsStateDisabled(product.productAttributes![index].name!, false);
setState(() {
selections = cloneSelections;
@@ -121,14 +121,14 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
children: <Widget>[],
);
List<ProductOption> productOptions = product.productAttributes![index].productOptions;
List<ProductOption> productOptions = product.productAttributes![index].productOptions!;
if (!optionsState.containsKey(product.productAttributes![index].name)) {
List<Map<String, dynamic>> optionState = [];
for (var i = 0; i < productOptions.length; i++) {
optionState.add({'name': product.productAttributes![index].productOptions![i].name, 'disabled': false, 'check': false});
}
optionsState[product.productAttributes![index].name] = optionState;
optionsState[product.productAttributes![index].name!] = optionState;
}
if (selections.containsKey(product.productAttributes![index].name!.toUpperCase())) {
@@ -199,7 +199,7 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
} else {
if (_checkOptionIsCheck(productOptions[i].name!)) {
setOptionsStateDisabled(
product.productAttributes![index].name, true);
product.productAttributes![index].name!, true);
optionsState[product.productAttributes![index]
.name][i]['disabled'] = false;
break;
@@ -232,16 +232,16 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
}
void disableOptionIfNotSelected() {
setOptionsStateDisabled(product.productAttributes![index].name, true);
setOptionsStateDisabled(product.productAttributes![index].name!, true);
for (var i = 0; i < optionsState[product.productAttributes![index].name].length; i++) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name, optionsState[product.productAttributes![index].name][i]['name']) != -1) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name!, optionsState[product.productAttributes![index].name][i]['name']) != -1) {
optionsState[product.productAttributes![index].name][i]['disabled'] = false;
}
}
}
bool _checkOptionIsCheck(String name) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name, name) != -1) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name!, name) != -1) {
return true;
}
return false;

20
lib/widgets/general/attribute/qty_options.dart
View File

@@ -41,7 +41,7 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
new Text(
S.of(context).check_option_select_token(product.productAttributes![this.index].name),
S.of(context).check_option_select_token(product.productAttributes![this.index].name!),
style: new TextStyle(
fontSize: 12.5,
),
@@ -86,7 +86,7 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
'adjust_amount': adjustAmount
};
var cloneSelections = json.decode(json.encode(selections));
int idx = Utils.selectionsContains(cloneSelections, product.productAttributes![index].name, name);
int idx = Utils.selectionsContains(cloneSelections, product.productAttributes![index].name!, name);
if (idx != -1) {
if (quantity == 1) {
cloneSelections[product.productAttributes![index].name!.toUpperCase()][idx]['quantity'] += 1;
@@ -112,7 +112,7 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
cloneSelections.remove(product.productAttributes![index].name!.toUpperCase());
}
setOptionsStateDisabled(product.productAttributes![index].name, false);
setOptionsStateDisabled(product.productAttributes![index].name!, false);
setState(() {
selections = cloneSelections;
@@ -125,19 +125,19 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
children: <Widget>[],
);
List<ProductOption> productOptions = product.productAttributes![index].productOptions;
List<ProductOption> productOptions = product.productAttributes![index].productOptions!;
if (!optionsState.containsKey(product.productAttributes![index].name)) {
List<Map<String, dynamic>> optionState = [];
for (var i = 0; i < productOptions.length; i++) {
int qty = 0;
int idx = Utils.selectionsContains(selections, product.productAttributes![index].name, productOptions[i].name!);
int idx = Utils.selectionsContains(selections, product.productAttributes![index].name!, productOptions[i].name!);
if (idx != -1) {
qty = selections[product.productAttributes![index].name!.toUpperCase()][idx]['quantity'];
}
optionState.add({'name': product.productAttributes![index].productOptions![i].name, 'disabled': false, 'quantity': qty, 'check': false});
}
optionsState[product.productAttributes![index].name] = optionState;
optionsState[product.productAttributes![index].name!] = optionState;
}
if (selections.containsKey(product.productAttributes![index].name!.toUpperCase())) {
@@ -207,7 +207,7 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
} else {
if (_checkOptionIsCheck(productOptions[i].name!)) {
setOptionsStateDisabled(
product.productAttributes![index].name, true);
product.productAttributes![index].name!, true);
optionsState[product.productAttributes![index]
.name][i]['disabled'] = false;
break;
@@ -240,16 +240,16 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
}
void disableOptionIfNotSelected() {
setOptionsStateDisabled(product.productAttributes![index].name, true);
setOptionsStateDisabled(product.productAttributes![index].name!, true);
for (var i = 0; i < optionsState[product.productAttributes![index].name].length; i++) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name, optionsState[product.productAttributes![index].name][i]['name']) != -1) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name!, optionsState[product.productAttributes![index].name][i]['name']) != -1) {
optionsState[product.productAttributes![index].name][i]['disabled'] = false;
}
}
}
bool _checkOptionIsCheck(String name) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name, name) != -1) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name!, name) != -1) {
return true;
}
return false;

14
lib/widgets/general/attribute/radio_options.dart
View File

@@ -40,7 +40,7 @@ class RadioOptionsState extends OptionsBaseState<RadioOptions> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
new Text(
S.of(context).radio_option_select_token(product.productAttributes![this.index].name),
S.of(context).radio_option_select_token(product.productAttributes![this.index].name!),
style: new TextStyle(
fontSize: 12.5,
),
@@ -102,7 +102,7 @@ class RadioOptionsState extends OptionsBaseState<RadioOptions> {
extraJson, Rule.RULE_EXCLUSIVE_SELECTION);
if (exclusiveRule != null) {
if (_checkOptionIsCheck(productOption.name!)) {
setOptionsStateDisabled(product.productAttributes![index].name, false);
setOptionsStateDisabled(product.productAttributes![index].name!, false);
}
}
}
@@ -118,24 +118,24 @@ class RadioOptionsState extends OptionsBaseState<RadioOptions> {
children: <Widget>[],
);
List<ProductOption> productOptions = product.productAttributes![index].productOptions;
List<ProductOption> productOptions = product.productAttributes![index].productOptions!;
if (!optionsState.containsKey(product.productAttributes![index].name)) {
List<Map<String, dynamic>> optionState = [];
for (var i = 0; i < productOptions.length; i++) {
optionState.add({'name': product.productAttributes![index].productOptions![i].name, 'disabled': false, 'check': false});
}
optionsState[product.productAttributes![index].name] = optionState;
optionsState[product.productAttributes![index].name!] = optionState;
}
for (var i = 0; i < productOptions.length; i++) {
Map<String, dynamic> extraJson = Utils.stringToJson(productOptions[i].extra!);
Map<String, dynamic> extraJson = Utils.stringToJson(productOptions[i].extra!)!;
if (extraJson != null) {
Map<String, dynamic> exclusiveRule = Rule.getRule(
extraJson, Rule.RULE_EXCLUSIVE_SELECTION);
if (exclusiveRule != null) {
if (_checkOptionIsCheck(productOptions[i].name!)) {
setOptionsStateDisabled(product.productAttributes![index].name, true);
setOptionsStateDisabled(product.productAttributes![index].name!, true);
optionsState[product.productAttributes![index].name][i]['disabled'] = false;
break;
}
@@ -153,7 +153,7 @@ class RadioOptionsState extends OptionsBaseState<RadioOptions> {
}
bool _checkOptionIsCheck(String name) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name, name) != -1) {
if (Utils.selectionsContains(selections, product.productAttributes![index].name!, name) != -1) {
return true;
}
return false;

8
lib/widgets/mobile/mobile_checkout.dart
View File

@@ -732,7 +732,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
subtotal = 0.0;
for (var i = 0; i < cartInfo.productList!.length; i++) {
subtotal += cartInfo.productList![i].totalPrice;
subtotal += cartInfo.productList![i].totalPrice!;
column.children.add(lineItem(cartInfo.productList![i]));
}
column.children.add(GestureDetector(
@@ -838,7 +838,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Container(
alignment: Alignment.centerRight,
child: Text(
S.of(context).extra_fee_token(cartInfo.extraFeeList![i].name, cartInfo.extraFeeList![i].rate),
S.of(context).extra_fee_token(cartInfo.extraFeeList![i].name!, cartInfo.extraFeeList![i].rate!),
style: TextStyle(
color: Colors.grey,
),
@@ -1317,7 +1317,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
child: Container(
padding: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0, bottom: 12.0),
child: Text(
bookingDateTime.bookTimes![position].viewTime,
bookingDateTime.bookTimes![position].viewTime!,
),
decoration: BoxDecoration(
border: Border(
@@ -1932,7 +1932,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
));
for (int i = 0; i < cartInfo.businessInfo!.quickInputs!.length; i++) {
String qi = cartInfo.businessInfo!.quickInputs![i].value;
String qi = cartInfo.businessInfo!.quickInputs![i].value!;
w.children.add(TextButton(
child: Text(
qi,

2
lib/widgets/mobile/mobile_orders.dart
View File

@@ -152,7 +152,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
row.children.add(Expanded(
child: Container(
child: Text(
order.cartInfo!.productList![0].name,
order.cartInfo!.productList![0].name!,
style: TextStyle(
fontSize: 14.0,
),

2
lib/widgets/mobile/mobile_product_detail_page.dart
View File

@@ -421,7 +421,7 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
images.add(productDetail.image!);
for (var i = 0; i < productDetail.images!.length; i++) {
// print('>>https:' + productDetail.images[i].image);
images.add(productDetail.images![i].image);
images.add(productDetail.images![i].image!);
}
for (var i = 0; i < images.length; i++) {

10
lib/widgets/mobile/shop.dart
View File

@@ -286,7 +286,7 @@ class ShopState extends State<Shop>
GestureDetector(
child: Container(
child: Util.showImage(
_business.promoProducts![i].imagePath,
_business.promoProducts![i].imagePath!,
width: 110.0,
),
),
@@ -296,7 +296,7 @@ class ShopState extends State<Shop>
),
Container(
child: Text(
_business.promoProducts![i].name,
_business.promoProducts![i].name!,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 14.0),
@@ -306,7 +306,7 @@ class ShopState extends State<Shop>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ShowPrice(
_business.promoProducts![i].price,
_business.promoProducts![i].price!,
currencySign: '\$',
regularPrice: _business.promoProducts![i].regularPrice,
),
@@ -1102,7 +1102,7 @@ class ShopState extends State<Shop>
pages.add(new GestureDetector(
child: new Container(
child: Util.showImage(
_business.slideImages![i].imageUrl,
_business.slideImages![i].imageUrl!,
fit: BoxFit.cover,
),
),
@@ -1214,7 +1214,7 @@ class ShopState extends State<Shop>
void _selectCategory(int index) {
if (displayProductByCategoryClick && _categoryProducts[index].id! > 0) {
categoryId = _categoryProducts[index].id;
categoryId = _categoryProducts[index].id!;
loadProducts();
return;
}

2
tools/nullfix.py
View File

@@ -132,7 +132,7 @@ def insert_arg_bang(line, col0):
if not val: return None
if val[0] in '0123456789"\'': return None # 字面量跳过
if val in ('true','false','null'): return None
if not re.fullmatch(r'[\w.\[\()!]+', val): return None # 含运算符/空格跳过
if not re.fullmatch(r'[\w.\[\]()!]+', val): return None # 含运算符/空格跳过
return line[:j+1]+'!'+line[j+1:]
def make_field_nullable(lines, name):