Merge pull request #245 from NKUST-ITC/fix/3.10.3

Fix/3.10.3
NKUST-ITC · Jan 6, 2024 · ead7e9b · ead7e9b
2 parents 446a574 + ad2bdc9
commit ead7e9b
Show file tree

Hide file tree

Showing 31 changed files with 361 additions and 99 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '11.0'
+          java-version: '17.0'
       - name: Decrypt Android keys
         run: sh ./.github/scripts/decrypt_android_keys.sh
         env:
@@ -50,8 +50,14 @@ jobs:
 
   deploy_ios:
     name: iOS Deploy TestFlight
-    runs-on: macOS-latest
+    runs-on: macos-13
     steps:
+      # Ensure the xcode version is available
+      - name: List Xcode installations
+        run: sudo ls -1 /Applications | grep "Xcode"
+      # Select your required version
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
       - name: Checkout code
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '11.0'
+          java-version: '17.0'
       - name: Decrypt Android keys
         run: sh ./.github/scripts/decrypt_android_keys.sh
         env:
@@ -53,8 +53,14 @@ jobs:
 
   build_ios:
     name: Build iOS App
-    runs-on: macOS-latest
+    runs-on: macos-13
     steps:
+      # Ensure the xcode version is available
+      - name: List Xcode installations
+        run: sudo ls -1 /Applications | grep "Xcode"
+      # Select your required version
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Decrypt iOS keys

diff --git a/assets_test/login/password_error_five.html b/assets_test/login/password_error_five.html
@@ -0,0 +1,40 @@
+<script>alert('Please Logon From Homepage!!');top.location.href='index.html';</script>
+
+
+<html>
+<title></title>
+<head>
+    <META HTTP-EQUIV="Pragma" content="no-cache">
+    <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
+    <META HTTP-EQUIV="Content-Type" content="text/html;charset=UTF-8">
+    <script language='javascript'>
+function showalert(msgfilename){
+	obj = window.open (msgfilename,"msgwindow","height=500,width=700,scrollbars=1");
+}
+</script>
+</head>
+
+<body style="margin-top:0;margin-left:0;" bgcolor="#dcdcdc">
+
+
+
+
+
+
+
+
+
+
+
+<script language='javascript'>alert('您先前已登入失敗達5次!!請30分鐘後再嘗試登入!!');top.location.href='index.html';</script>
+<script type="text/javascript">
+function go_change()
+{
+	thisform.action = "system/sys010_changepwd_mod.jsp" ;
+	thisform.method = "post";
+	thisform.target = "_self";
+	thisform.submit();
+}
+</script>
+</body>
+</html>
diff --git a/ios/CourseAppWidget/CourseAppWidget.swift b/ios/CourseAppWidget/CourseAppWidget.swift
@@ -119,7 +119,7 @@ struct CourseAppWidgetEntryView: View {
                     .padding([.trailing, .leading], 8)
                     .multilineTextAlignment(.center)
             }
-            .background(getContentBackgroudColor())
+            .widgetBackground(getContentBackgroudColor())
         }
     }
 }
@@ -134,6 +134,7 @@ struct CourseAppWidget: Widget {
         }
         .configurationDisplayName("上課提醒")
         .description("提醒本日下一堂課")
+        .disableContentMarginsIfNeeded()
     }
 }
 
@@ -143,3 +144,25 @@ struct CourseAppWidget_Previews: PreviewProvider {
             .previewContext(WidgetPreviewContext(family: .systemSmall))
     }
 }
+
+extension View {
+    func widgetBackground(_ backgroundView: some View) -> some View {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return containerBackground(for: .widget) {
+                backgroundView
+            }
+        } else {
+            return background(backgroundView)
+        }
+    }
+}
+
+extension WidgetConfiguration {
+    func disableContentMarginsIfNeeded() -> some WidgetConfiguration {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return self.contentMarginsDisabled()
+        } else {
+            return self
+        }
+    }
+}