marking
/
Marking.Client.Moblie
19
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: marking:main
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t
..
compare: marking:login_school_choice
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t

No commits in common. "main" and "login_school_choice" have entirely different histories.
main ... login_scho

5 changed files with 59 additions and 481 deletions
Show Stats Expand all files Collapse all files

2
marking_app/ios/Podfile.lock
View File

@ -117,4 +117,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 64629b724b9886c2d78e6972ff5ef90e370df047 PODFILE CHECKSUM: 64629b724b9886c2d78e6972ff5ef90e370df047
COCOAPODS: 1.12.1 COCOAPODS: 1.11.3

417
marking_app/ios/Runner.xcodeproj/project.pbxproj
View File

@ -16,177 +16,6 @@
EE3BAAE20F3BEC99D310EC6B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AE64B664D96A59005B338D3 /* Pods_Runner.framework */; }; EE3BAAE20F3BEC99D310EC6B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AE64B664D96A59005B338D3 /* Pods_Runner.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
0B2156402C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3E842772C2699BC8F65359A06505C5A5;
remoteInfo = app_installer;
};
0B2156422C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6D3FD4746C5C4B5292B7C4C862F01EF9;
remoteInfo = connectivity_plus;
};
0B2156442C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 95AEC45023DC633BFEBFE200DD4C81FC;
remoteInfo = flutter_keyboard_visibility;
};
0B2156462C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D0C5A85ABEF5ED03A54A449B87B69225;
remoteInfo = fluttertoast;
};
0B2156482C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 768975E636D1D2FB85622FB67DB04E5A;
remoteInfo = image_picker_ios;
};
0B21564A2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F0C7EFBFF01CFAAB52BA74E6CB40CE2C;
remoteInfo = "image_picker_ios-image_picker_ios_privacy";
};
0B21564C2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 723F1D07DBDF0EC2E0D163A4996FEE3D;
remoteInfo = install_plugin;
};
0B21564E2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6E45859F778E298A6DDE318300ACC4C5;
remoteInfo = package_info;
};
0B2156502C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = AE157A33FEF959A214796BFF348717F6;
remoteInfo = path_provider_foundation;
};
0B2156522C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3DBD4BADE27F8B91024E4B4B4DD75DB5;
remoteInfo = "path_provider_foundation-path_provider_foundation_privacy";
};
0B2156542C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C7AD28D5FB25A8DEDF61F78996932FA6;
remoteInfo = permission_handler_apple;
};
0B2156562C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 669E8F25E1897672BDB80B7EB784DA24;
remoteInfo = "Pods-Runner";
};
0B2156582C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 21B03CA622E690725A6626C088E1D09F;
remoteInfo = ReachabilitySwift;
};
0B21565A2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = DE8135CAE607F7824D08D08BDA5968B9;
remoteInfo = rive_common;
};
0B21565C2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 93C6A45C6E4792269BE9BE0073839BF0;
remoteInfo = shared_preferences_foundation;
};
0B21565E2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0652FCE3FC19056983AABE058B3CC45B;
remoteInfo = "shared_preferences_foundation-shared_preferences_foundation_privacy";
};
0B2156602C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B799BFFEC5B11F90F501202080A57F37;
remoteInfo = sqflite;
};
0B2156622C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 58497E6EB70BA49D9A885C22D09B7A7C;
remoteInfo = "sqflite-sqflite_darwin_privacy";
};
0B2156642C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 55E0AFD333353D71ACC2207149E879D6;
remoteInfo = Toast;
};
0B2156662C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7B7C06D35B3BC2BD649AAA1A489E49DA;
remoteInfo = url_launcher_ios;
};
0B2156682C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = DBA6F34C072B134D3BE38983776DD1C3;
remoteInfo = "url_launcher_ios-url_launcher_ios_privacy";
};
0B21566A2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 315E7D4955EFF42177E9BBC4382B527F;
remoteInfo = wakelock;
};
0B21566C2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7409A9316D1EEFAC7B383BE8CEC1BE03;
remoteInfo = webview_flutter_wkwebview;
};
0B21566E2C0D8FFF00D5A718 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 163A707D53693953E4DC7E0DE4C912A4;
remoteInfo = "webview_flutter_wkwebview-webview_flutter_wkwebview_privacy";
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
9705A1C41CF9048500538489 /* Embed Frameworks */ = { 9705A1C41CF9048500538489 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase; isa = PBXCopyFilesBuildPhase;
@ -201,7 +30,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = Pods/Pods.xcodeproj; sourceTree = "<group>"; };
0BD0304F2994F44800EB7527 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; }; 0BD0304F2994F44800EB7527 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@ -236,43 +64,11 @@
050DAC6E1AD50AF47A1F4114 /* Frameworks */ = { 050DAC6E1AD50AF47A1F4114 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */,
9AE64B664D96A59005B338D3 /* Pods_Runner.framework */, 9AE64B664D96A59005B338D3 /* Pods_Runner.framework */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
0B2156252C0D8FFF00D5A718 /* Products */ = {
isa = PBXGroup;
children = (
0B2156412C0D8FFF00D5A718 /* app_installer */,
0B2156432C0D8FFF00D5A718 /* connectivity_plus */,
0B2156452C0D8FFF00D5A718 /* flutter_keyboard_visibility */,
0B2156472C0D8FFF00D5A718 /* fluttertoast */,
0B2156492C0D8FFF00D5A718 /* image_picker_ios */,
0B21564B2C0D8FFF00D5A718 /* image_picker_ios-image_picker_ios_privacy */,
0B21564D2C0D8FFF00D5A718 /* install_plugin */,
0B21564F2C0D8FFF00D5A718 /* package_info */,
0B2156512C0D8FFF00D5A718 /* path_provider_foundation */,
0B2156532C0D8FFF00D5A718 /* path_provider_foundation-path_provider_foundation_privacy */,
0B2156552C0D8FFF00D5A718 /* permission_handler_apple */,
0B2156572C0D8FFF00D5A718 /* Pods-Runner */,
0B2156592C0D8FFF00D5A718 /* ReachabilitySwift */,
0B21565B2C0D8FFF00D5A718 /* rive_common */,
0B21565D2C0D8FFF00D5A718 /* shared_preferences_foundation */,
0B21565F2C0D8FFF00D5A718 /* shared_preferences_foundation-shared_preferences_foundation_privacy */,
0B2156612C0D8FFF00D5A718 /* sqflite */,
0B2156632C0D8FFF00D5A718 /* sqflite-sqflite_darwin_privacy */,
0B2156652C0D8FFF00D5A718 /* Toast */,
0B2156672C0D8FFF00D5A718 /* url_launcher_ios */,
0B2156692C0D8FFF00D5A718 /* url_launcher_ios-url_launcher_ios_privacy */,
0B21566B2C0D8FFF00D5A718 /* wakelock */,
0B21566D2C0D8FFF00D5A718 /* webview_flutter_wkwebview */,
0B21566F2C0D8FFF00D5A718 /* webview_flutter_wkwebview-webview_flutter_wkwebview_privacy */,
);
name = Products;
sourceTree = "<group>";
};
9740EEB11CF90186004384FC /* Flutter */ = { 9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -379,12 +175,6 @@
mainGroup = 97C146E51CF9000F007C117D; mainGroup = 97C146E51CF9000F007C117D;
productRefGroup = 97C146EF1CF9000F007C117D /* Products */; productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
projectDirPath = ""; projectDirPath = "";
projectReferences = (
{
ProductGroup = 0B2156252C0D8FFF00D5A718 /* Products */;
ProjectRef = 0B2156242C0D8FFF00D5A718 /* Pods.xcodeproj */;
},
);
projectRoot = ""; projectRoot = "";
targets = ( targets = (
97C146ED1CF9000F007C117D /* Runner */, 97C146ED1CF9000F007C117D /* Runner */,
@ -392,201 +182,6 @@
}; };
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */
0B2156412C0D8FFF00D5A718 /* app_installer */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = app_installer;
path = app_installer.framework;
remoteRef = 0B2156402C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156432C0D8FFF00D5A718 /* connectivity_plus */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = connectivity_plus;
path = connectivity_plus.framework;
remoteRef = 0B2156422C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156452C0D8FFF00D5A718 /* flutter_keyboard_visibility */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = flutter_keyboard_visibility;
path = flutter_keyboard_visibility.framework;
remoteRef = 0B2156442C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156472C0D8FFF00D5A718 /* fluttertoast */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = fluttertoast;
path = fluttertoast.framework;
remoteRef = 0B2156462C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156492C0D8FFF00D5A718 /* image_picker_ios */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = image_picker_ios;
path = image_picker_ios.framework;
remoteRef = 0B2156482C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21564B2C0D8FFF00D5A718 /* image_picker_ios-image_picker_ios_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "image_picker_ios-image_picker_ios_privacy";
path = image_picker_ios_privacy.bundle;
remoteRef = 0B21564A2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21564D2C0D8FFF00D5A718 /* install_plugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = install_plugin;
path = install_plugin.framework;
remoteRef = 0B21564C2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21564F2C0D8FFF00D5A718 /* package_info */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = package_info;
path = package_info.framework;
remoteRef = 0B21564E2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156512C0D8FFF00D5A718 /* path_provider_foundation */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = path_provider_foundation;
path = path_provider_foundation.framework;
remoteRef = 0B2156502C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156532C0D8FFF00D5A718 /* path_provider_foundation-path_provider_foundation_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "path_provider_foundation-path_provider_foundation_privacy";
path = path_provider_foundation_privacy.bundle;
remoteRef = 0B2156522C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156552C0D8FFF00D5A718 /* permission_handler_apple */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = permission_handler_apple;
path = permission_handler_apple.framework;
remoteRef = 0B2156542C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156572C0D8FFF00D5A718 /* Pods-Runner */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = "Pods-Runner";
path = Pods_Runner.framework;
remoteRef = 0B2156562C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156592C0D8FFF00D5A718 /* ReachabilitySwift */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = ReachabilitySwift;
path = Reachability.framework;
remoteRef = 0B2156582C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21565B2C0D8FFF00D5A718 /* rive_common */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = rive_common;
path = rive_common.framework;
remoteRef = 0B21565A2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21565D2C0D8FFF00D5A718 /* shared_preferences_foundation */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = shared_preferences_foundation;
path = shared_preferences_foundation.framework;
remoteRef = 0B21565C2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21565F2C0D8FFF00D5A718 /* shared_preferences_foundation-shared_preferences_foundation_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "shared_preferences_foundation-shared_preferences_foundation_privacy";
path = shared_preferences_foundation_privacy.bundle;
remoteRef = 0B21565E2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156612C0D8FFF00D5A718 /* sqflite */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = sqflite;
path = sqflite.framework;
remoteRef = 0B2156602C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156632C0D8FFF00D5A718 /* sqflite-sqflite_darwin_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "sqflite-sqflite_darwin_privacy";
path = sqflite_darwin_privacy.bundle;
remoteRef = 0B2156622C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156652C0D8FFF00D5A718 /* Toast */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = Toast;
path = Toast.framework;
remoteRef = 0B2156642C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156672C0D8FFF00D5A718 /* url_launcher_ios */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = url_launcher_ios;
path = url_launcher_ios.framework;
remoteRef = 0B2156662C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B2156692C0D8FFF00D5A718 /* url_launcher_ios-url_launcher_ios_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "url_launcher_ios-url_launcher_ios_privacy";
path = url_launcher_ios_privacy.bundle;
remoteRef = 0B2156682C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21566B2C0D8FFF00D5A718 /* wakelock */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = wakelock;
path = wakelock.framework;
remoteRef = 0B21566A2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21566D2C0D8FFF00D5A718 /* webview_flutter_wkwebview */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
name = webview_flutter_wkwebview;
path = webview_flutter_wkwebview.framework;
remoteRef = 0B21566C2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0B21566F2C0D8FFF00D5A718 /* webview_flutter_wkwebview-webview_flutter_wkwebview_privacy */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
name = "webview_flutter_wkwebview-webview_flutter_wkwebview_privacy";
path = webview_flutter_wkwebview_privacy.bundle;
remoteRef = 0B21566E2C0D8FFF00D5A718 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */ /* Begin PBXResourcesBuildPhase section */
97C146EC1CF9000F007C117D /* Resources */ = { 97C146EC1CF9000F007C117D /* Resources */ = {
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
@ -757,7 +352,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 25; CURRENT_PROJECT_VERSION = 24;
DEVELOPMENT_TEAM = CYDU583KN6; DEVELOPMENT_TEAM = CYDU583KN6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
@ -765,7 +360,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.108; MARKETING_VERSION = 1.0.107;
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@ -895,7 +490,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 25; CURRENT_PROJECT_VERSION = 24;
DEVELOPMENT_TEAM = CYDU583KN6; DEVELOPMENT_TEAM = CYDU583KN6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
@ -903,7 +498,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.108; MARKETING_VERSION = 1.0.107;
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@ -925,7 +520,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 25; CURRENT_PROJECT_VERSION = 24;
DEVELOPMENT_TEAM = CYDU583KN6; DEVELOPMENT_TEAM = CYDU583KN6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
@ -933,7 +528,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.108; MARKETING_VERSION = 1.0.107;
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp; PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

61
marking_app/lib/pages/login/index.dart
View File

@ -9,7 +9,6 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:collection/collection.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:dio/adapter.dart'; import 'package:dio/adapter.dart';
@ -60,7 +59,7 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
//文本输入框控制器 //文本输入框控制器
late final TextEditingController _userNameController; late final TextEditingController _userNameController;
late final TextEditingController _passwordController; late final TextEditingController _passwordController;
int? lastTimeSchoolId; // 上次登录保留的学校ID
int? schoolId; int? schoolId;
List<UseLoginSchool> schools = []; // 学校数据 List<UseLoginSchool> schools = []; // 学校数据
@ -105,44 +104,27 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
setState(() { setState(() {
_passwordController.text = valMap['pwd']; _passwordController.text = valMap['pwd'];
_userNameController.text = valMap['account']; _userNameController.text = valMap['account'];
lastTimeSchoolId = int.tryParse(valMap['schoolId']);
print('原始学校ID $schoolId');
keepPwd = true; keepPwd = true;
}); });
}); });
} }
void getShowRegister() async { void getShowRegister() async {
try { BaseStructureResult<dynamic> resultData = await client.showRegister();
var client = await getClient(); if (resultData.success) setState(() => showRegister = resultData.data);
BaseStructureResult<dynamic> resultData = await client.showRegister();
if (resultData.success) setState(() => showRegister = resultData.data);
} catch (e) {}
} }
// 获取用户学校数据 // 获取用户学校数据
void getSchoolData(String loginName) async { void getSchoolData(String loginName) async {
var _client = await getClient();
if (loginName.length != 0) { if (loginName.length != 0) {
try { var res = await _client.toLoginGetSchools(loginName);
if (loginName == '18888888888') { if (res.success) {
schoolId = 10079; schools = res.data ?? [];
return; schoolId = schools[0].schoolId;
} setState(() {});
var _client = await getClient(); return;
var res = await _client.toLoginGetSchools(loginName); }
if (res.success) {
schools = res.data ?? [];
UseLoginSchool? schoolElement;
if (lastTimeSchoolId != null) schoolElement = schools.firstWhereOrNull((e) => e.schoolId == lastTimeSchoolId);
if (schoolElement != null)
schoolId = schoolElement.schoolId;
else
schoolId = schools[0].schoolId;
setState(() {});
return;
}
} catch (e) {}
} }
if (schools.isNotEmpty || schoolId != null) { if (schools.isNotEmpty || schoolId != null) {
schools = []; schools = [];
@ -155,7 +137,6 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
String userName = _userNameController.text.trim(); String userName = _userNameController.text.trim();
int useNameLength = userName.length; int useNameLength = userName.length;
bool hasNameValNew = useNameLength > 0; bool hasNameValNew = useNameLength > 0;
if (!hasNameValNew) lastTimeSchoolId = null;
if (hasNameValNew != hasNameVal) toUpState(setState, () => hasNameVal = hasNameValNew, mounted); if (hasNameValNew != hasNameVal) toUpState(setState, () => hasNameVal = hasNameValNew, mounted);
const isProd = bool.fromEnvironment('dart.vm.product'); const isProd = bool.fromEnvironment('dart.vm.product');
getSchoolData(userName); // 获取用户学校数据 getSchoolData(userName); // 获取用户学校数据
@ -269,6 +250,7 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
), ),
), ),
), ),
$SchoolDataDropDown(schools, schoolId, (int? id) => schoolId = id),
TextField( TextField(
focusNode: _pwdFocus, focusNode: _pwdFocus,
controller: _passwordController, controller: _passwordController,
@ -297,10 +279,6 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
labelStyle: TextStyle(fontSize: 16.sp, color: const Color.fromRGBO(148, 163, 182, 1)), labelStyle: TextStyle(fontSize: 16.sp, color: const Color.fromRGBO(148, 163, 182, 1)),
), ),
), ),
$SchoolDataDropDown(schools, schoolId, (int? id) {
schoolId = id;
lastTimeSchoolId = null;
}),
SizedBox(height: 12.h), SizedBox(height: 12.h),
Row( Row(
children: [ children: [
@ -351,7 +329,9 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
spreadRadius: 0.5, //阴影扩散程度 spreadRadius: 0.5, //阴影扩散程度
) )
], ],
borderRadius: BorderRadius.all(Radius.circular(8.w)), borderRadius: BorderRadius.all(
Radius.circular(8.w),
),
), ),
alignment: Alignment.center, alignment: Alignment.center,
width: double.infinity, width: double.infinity,
@ -435,13 +415,14 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
void toLogin() async { void toLogin() async {
if (!canLogin) return; if (!canLogin) return;
setState(() => canLogin = false);
void toMsg(msg) { void toMsg(msg) {
Future.delayed(Duration.zero, () => ToastUtils.showError(msg)); ToastUtils.showError(msg);
setState(() => canLogin = true); setState(() => canLogin = true);
} }
try { try {
setState(() => canLogin = false);
FocusScope.of(context).requestFocus(_theFocus); FocusScope.of(context).requestFocus(_theFocus);
if (!readAgreement) { if (!readAgreement) {
var resFlag = await showDialog<bool>( var resFlag = await showDialog<bool>(
@ -508,7 +489,7 @@ class _TheLoginState extends ConsumerState<TheLogin> with CommonMixin {
fastData.setUser(userRes.data!).then((value) { fastData.setUser(userRes.data!).then((value) {
// 记住密码 // 记住密码
if (keepPwd) { if (keepPwd) {
fastData.setUserPwdAndAccount({'pwd': userPwd, 'account': userName, 'schoolId': schoolId.toString()}); fastData.setUserPwdAndAccount({'pwd': userPwd, 'account': userName});
} }
// 更新 // 更新
ref.read(userProvider.notifier).initUserInfo(); ref.read(userProvider.notifier).initUserInfo();
@ -562,10 +543,10 @@ Widget $schoolDataDropDown(BuildContext context, List<UseLoginSchool> schools, i
if (useSchool.value.isEmpty) return SizedBox(); if (useSchool.value.isEmpty) return SizedBox();
return Padding( return Padding(
padding: EdgeInsets.only(top: 24.h), padding: EdgeInsets.symmetric(vertical: 10.h),
child: Column( child: Column(
children: [ children: [
Container(alignment: Alignment.topLeft, child: quickText('登录学校', size: 12.sp, color: const Color.fromRGBO(148, 163, 182, 1))), Container(alignment: Alignment.topLeft, child: quickText('学校', size: 12.sp, color: const Color.fromRGBO(148, 163, 182, 1))),
Container( Container(
height: 40.h, height: 40.h,
width: double.infinity, width: double.infinity,

56
marking_app/lib/pages/register/index.dart
View File

@ -20,7 +20,8 @@ class Register extends StatefulWidget {
State<Register> createState() => _RegisterState(); State<Register> createState() => _RegisterState();
} }
class _RegisterState extends State<Register> with CommonMixin { class _RegisterState extends State<Register> with CommonMixin{
late final FocusNode _theFocus; late final FocusNode _theFocus;
late final FocusNode _pwdFocus; // 密码 late final FocusNode _pwdFocus; // 密码
//文本输入框控制器 //文本输入框控制器
@ -32,7 +33,7 @@ class _RegisterState extends State<Register> with CommonMixin {
bool canLogin = true; bool canLogin = true;
@override @override
void initState() { void initState(){
super.initState(); super.initState();
_userNameController = TextEditingController(); _userNameController = TextEditingController();
_passwordController = TextEditingController(); _passwordController = TextEditingController();
@ -49,7 +50,7 @@ class _RegisterState extends State<Register> with CommonMixin {
_theFocus.dispose(); _theFocus.dispose();
} }
void toRegister() async { void toRegister() async{
if (!canLogin) return; if (!canLogin) return;
setState(() => canLogin = false); setState(() => canLogin = false);
void toMsg(msg) { void toMsg(msg) {
@ -59,29 +60,25 @@ class _RegisterState extends State<Register> with CommonMixin {
FocusScope.of(context).requestFocus(_theFocus); FocusScope.of(context).requestFocus(_theFocus);
try { String userName = _userNameController.text.trim();
String userName = _userNameController.text.trim(); String userPwd = _passwordController.text.trim();
String userPwd = _passwordController.text.trim(); if (userName == '') return toMsg('请填写用户账号');
if (userName == '') return toMsg('请填写用户账号'); if (userPwd == '') return toMsg('请填写密码');
if (userPwd == '') return toMsg('请填写密码'); if (!readAgreement) return toMsg('请勾选我已阅读用户协议和隐私协议');
if (!readAgreement) return toMsg('请勾选我已阅读用户协议和隐私协议');
String userPwdMd5 = CommonUtils.generateMD5(userPwd); String userPwdMd5 = CommonUtils.generateMD5(userPwd);
print('注册userPwdMd5=$userPwdMd5'); print('注册userPwdMd5=$userPwdMd5');
EasyLoading.show(status: 'loading...'); EasyLoading.show(status: 'loading...');
RestClient client = await getClientLogin(); RestClient client = await getClientLogin();
BaseStructureResult<dynamic> resultData = await client.toRegister(UserLoginParams(userName, userPwdMd5, 0)); BaseStructureResult<dynamic> resultData = await client.toRegister(UserLoginParams(userName, userPwdMd5));
if (resultData.code != 200) { if (resultData.code != 200) {
return toMsg(resultData.message ?? '注册失败，请重试'); return toMsg(resultData.message ?? '注册失败，请重试');
}
ToastUtils.showSuccess('注册成功,请登录');
// 跳转登录页
RouterManager.router.navigateTo(context, RouterManager.loginPath);
} finally {
EasyLoading.dismiss();
} }
EasyLoading.dismiss();
ToastUtils.showSuccess('注册成功,请登录');
// 跳转登录页
RouterManager.router.navigateTo(context, RouterManager.loginPath);
} }
void _showPassword() { void _showPassword() {
@ -235,8 +232,10 @@ class _RegisterState extends State<Register> with CommonMixin {
checkColor: Colors.white, checkColor: Colors.white,
value: readAgreement, value: readAgreement,
onChanged: (value) { onChanged: (value) {
FocusScope.of(context).requestFocus(_pwdFocus); FocusScope.of(context)
FocusScope.of(context).requestFocus(_theFocus); .requestFocus(_pwdFocus);
FocusScope.of(context)
.requestFocus(_theFocus);
setState(() { setState(() {
readAgreement = value ?? false; readAgreement = value ?? false;
}); });
@ -271,15 +270,18 @@ class _RegisterState extends State<Register> with CommonMixin {
), ),
]), ]),
) )
], ],
), ),
)), )),
Positioned( Positioned(
top: MediaQuery.of(context).padding.top + 20.r, top: MediaQuery.of(context).padding.top+20.r,
left: 20.r, left: 20.r,
child: InkWell( child: InkWell(
onTap: () => Navigator.pop(context), onTap: () => Navigator.pop(context),
child: Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white, size: 24.sp), child: Icon(Icons.arrow_back_ios_new_rounded,
color: Colors.white, size: 24.sp),
), ),
), ),
], ],

4
marking_app/pubspec.yaml
View File

@ -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. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.108+3 version: 1.0.107+2
environment: environment:
sdk: ">=2.17.1 <3.0.0" sdk: ">=2.17.1 <3.0.0"
@ -104,7 +104,7 @@ dependencies:
# multi_select_flutter: ^4.1.3 # multi_select_flutter: ^4.1.3
dropdown_button2: ^2.3.9 dropdown_button2: ^2.3.9
# copy # copy
# clipboard: ^0.1.3 clipboard: ^0.1.3
image: ^4.1.3 image: ^4.1.3
awesome_dialog: ^3.1.0 awesome_dialog: ^3.1.0
badges: ^3.1.2 badges: ^3.1.2