xt / Flutter-ReserveApp · Commits

Go to a project

Commit c88ef98a6266c046329768774cceb3017798ff26

Authored by wdn127929
1 parent 641bef06
build: skipped

订座详情页修改金额和人数键盘上方自定义 完成 按钮 方法里没有让输入框失去焦点,导致获得焦点方法重复执行

Inline Side-by-side
Showing 4 changed files with 21 additions and 28 deletions
... ... @@ -20,19 +20,19 @@ if (flutterRoot == null) {
def flutterVersionCode = "554"
def flutterVersionCode = "555"
if (flutterVersionCode == null) {
flutterVersionCode = '554'
flutterVersionCode = '555'
}
def flutterVersionName = "5.5.4"
def flutterVersionName = "5.5.5"
if (flutterVersionName == null) {
flutterVersionName = '5.5.4'
flutterVersionName = '5.5.5'
}
... ... @@ -83,8 +83,8 @@ android {
ndk {
//选择要添加的对应 cpu 类型的 .so 库。
abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
// abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
// abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
}
lintOptions {
... ...
... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 554;
CURRENT_PROJECT_VERSION = 5550;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -458,7 +458,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.4;
MARKETING_VERSION = 5.5.5;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 554;
CURRENT_PROJECT_VERSION = 5550;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -641,7 +641,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.4;
MARKETING_VERSION = 5.5.5;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 554;
CURRENT_PROJECT_VERSION = 5550;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -667,7 +667,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.4;
MARKETING_VERSION = 5.5.5;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ...
This diff could not be displayed because it is too large.
... ... @@ -3278,25 +3278,18 @@ class Utils {
static _getDsoltStrShow(String ddateSolt, String mname, {bool isCan = true}) {
String dsoltStr = '';
if (!isCan) {
if (mname == '早餐' || mname == '午餐' || mname == '晚餐') {
dsoltStr = ddateSolt == '1'
? '早上'
: ddateSolt == '2'
? '中午'
: '晚上';
} else {
if (mname == '早餐') {
mname ='早上';
} else if (mname == '午餐') {
mname ='中午';
} else if (mname == '晚餐') {
mname = '晚上';
}
dsoltStr = mname;
}
} else {
if (mname == '早餐' || mname == '午餐' || mname == '晚餐') {
dsoltStr = ddateSolt == '1'
? '早餐'
: ddateSolt == '2'
? '午餐'
: '晚餐';
} else {
dsoltStr = mname;
}
}
return dsoltStr;
}
... ...