temp

Author: wzyyyyyyy

iCourse/Helpers/Http.cs

@@ -15,7 +15,7 @@ public Http(TimeSpan timeout)
             : base(new HttpClientHandler
             {
                 UseCookies = true,
-                ServerCertificateCustomValidationCallback = (HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => true
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true
             })
         {
             Timeout = timeout;

iCourse/Helpers/JLUiCourseApi.cs

@@ -24,7 +24,6 @@ public class JLUiCourseApi
 
         public JLUiCourseApi()
         {
-            WeakReferenceMessenger.Default.Register<AttemptLoginMessage>(this, AttemptLoginAsync);
         }
 
         ~JLUiCourseApi()
@@ -131,10 +130,10 @@ public async Task AddToFavoritesAsync(Course course)
             }
         }
 
-        private async void AttemptLoginAsync(object recipient, AttemptLoginMessage message)
+        public async void AttemptLoginAsync(string captcha)
         {
 
-            var response = await PostLoginAsync(message.Captcha);
+            var response = await PostLoginAsync(captcha);
             var json = JObject.Parse(response);
 
             var code = json["code"].ToObject<int>();
@@ -272,7 +271,7 @@ private async Task<List<Course>> GetFavoriteCoursesAsync()
             return coursesList;
         }
 
-        private async Task<(bool isSuccess, string? msg)> SelectCourseAsync(Course courseInfo)
+        private async Task<(bool isSuccess, string? msg)> SelectCourseAsync(CourseInfo courseInfo)
         {
             client.SetReferer("https://icourses.jlu.edu.cn/xsxk/elective/grablessons?batchId=" + batch.batchId);
 
@@ -321,6 +320,8 @@ public async void StartSelectClassAsync()
         {
             var list = await GetFavoriteCoursesAsync();
 
+            Logger.WriteLine("收藏中的课程:\n" + string.Join("\n", list.Select(c => c.Name)));
+
             int totalTasks = list.Count;
             int completedTasks = 0;
 

iCourse/Messages/AttemptLoginMessage.cs

@@ -8,7 +8,7 @@ public enum ClassSelectType
         Elective, RestrictedElective
     }
 
-    public class Course : ObservableObject
+public class Course : ObservableObject
     {
         public Course()
         {
@@ -20,6 +20,7 @@ public Course(JToken json)
             TeacherName = json["SKJS"].ToString();
             Campus = json["XQ"].ToString();
             ClassLocation = json["YPSJDD"].ToString();
+            ClazzType = json["teachingClassType"].ToString();
             SecretVal = json["secretVal"].ToString();
             CourseId = json["JXBID"].ToString();
 
@@ -34,6 +35,7 @@ public Course(JToken json)
         public string Name { get; set; }
         public string CourseId { get; set; }
         public string TeacherName { get; set; }
+        public string ClazzType { get; set; }
         public string Campus { get; set; }
         public ClassSelectType SelectType { get; set; }
         public string ClassLocation { get; set; }

iCourse/Models/Course.cs

@@ -4,6 +4,8 @@
 using iCourse.Messages;
 using System.IO;
 using System.Windows.Media.Imaging;
+using iCourse.Helpers;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace iCourse.ViewModels
 {
@@ -37,7 +39,7 @@ private void LoadCaptchaImage(string base64Image)
         [RelayCommand]
         private void CloseWindow()
         {
-            WeakReferenceMessenger.Default.Send<AttemptLoginMessage>(new AttemptLoginMessage(Captcha));
+            App.ServiceProvider.GetService<JLUiCourseApi>().AttemptLoginAsync(captcha);
             WeakReferenceMessenger.Default.Send<CloseWindowMessage>(new CloseWindowMessage(typeof(CaptchaWindowViewModel)));
         }