diff --git a/marking_app/ios/Runner.xcodeproj/project.pbxproj b/marking_app/ios/Runner.xcodeproj/project.pbxproj index 52a3f5e..aa663a9 100644 --- a/marking_app/ios/Runner.xcodeproj/project.pbxproj +++ b/marking_app/ios/Runner.xcodeproj/project.pbxproj @@ -316,6 +316,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -351,7 +352,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = CYDU583KN6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -359,7 +360,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.96; + MARKETING_VERSION = 1.0.98; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -395,6 +396,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -450,6 +452,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -487,7 +490,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = CYDU583KN6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -495,7 +498,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.96; + MARKETING_VERSION = 1.0.98; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -517,7 +520,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = CYDU583KN6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -525,7 +528,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.96; + MARKETING_VERSION = 1.0.98; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/marking_app/lib/common/config/request_config.dart b/marking_app/lib/common/config/request_config.dart index 2825ae1..e249650 100644 --- a/marking_app/lib/common/config/request_config.dart +++ b/marking_app/lib/common/config/request_config.dart @@ -18,13 +18,13 @@ class RequestConfig { static const devBaseUrl = "https://mhw.qwit.top"; // 基本请求 static const devLoginBaseUrl = "https://mhw.qwit.top"; // 登录接口 static const devBaseUrlOfReport = "https://mhw.qwit.top"; // 获取报告接口 - static const proBaseUrlOfHomework = "https://mhw.qwit.top/hw"; // 获取作业接口 + // static const proBaseUrlOfHomework = "https://mhw.qwit.top/hw"; // 获取作业接口 /* 正式地址 */ static const proBaseUrl = "https://mk-hw.23544.com"; // 基本请求 static const proLoginBaseUrl = "https://mk-hw.23544.com"; // 登录接口 static const proBaseUrlOfReport = "https://dc-api.23544.com"; // 获取报告接口 - // static const proBaseUrlOfHomework = "https://mk-hw.23544.com/hw"; // 获取作业接口 + static const proBaseUrlOfHomework = "https://mk-hw.23544.com/hw"; // 获取作业接口 static const hwProxyKeywords = "/hw"; // 作业代理条件关键字 @@ -47,7 +47,10 @@ class RequestConfig { // 私有化构造函数,防止外部直接实例化 // 私有化构造函数,防止外部直接实例化 - RequestConfig._({required this.baseUrl, required this.baseUrlOfReport, required this.loginBaseUrl}); + RequestConfig._( + {required this.baseUrl, + required this.baseUrlOfReport, + required this.loginBaseUrl}); factory RequestConfig() { if (_instance == null) { @@ -67,8 +70,10 @@ class RequestConfig { newBaseUrlOfReport = devBaseUrlOfReport; newLoginBaseUrl = devLoginBaseUrl; } - _instance = - RequestConfig._(baseUrl: newBaseUrl, baseUrlOfReport: newBaseUrlOfReport, loginBaseUrl: newLoginBaseUrl); + _instance = RequestConfig._( + baseUrl: newBaseUrl, + baseUrlOfReport: newBaseUrlOfReport, + loginBaseUrl: newLoginBaseUrl); } return _instance!; } diff --git a/marking_app/pubspec.yaml b/marking_app/pubspec.yaml index 439bee6..417fb67 100644 --- a/marking_app/pubspec.yaml +++ b/marking_app/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.96 +version: 1.0.98 environment: sdk: ">=2.17.1 <3.0.0"