From 6c4a8eb34a0c72e65eec80c28cde1802fb76df58 Mon Sep 17 00:00:00 2001
From: liewstar <2935437378@qq.com>
Date: Fri, 29 Nov 2024 05:10:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=90=8E=E6=94=B6=E8=B5=B7=E9=94=AE=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .../java/com/example/CQUPT/MainActivity.java  | 16 ++++++----
 .../ui/course/CourseSelectionFragment.java    |  4 +++
 .../example/CQUPT/ui/login/LoginFragment.java |  4 +++
 .../CQUPT/ui/slideshow/SlideshowFragment.java |  3 ++
 .../com/example/CQUPT/utils/AppUsageInfo.java | 19 ++++++++++++
 .../example/CQUPT/utils/KeyboardUtils.java    | 30 +++++++++++++++++++
 .../CQUPT/utils/UsageWarningDialog.java       | 30 +++++++++++++++++--
 8 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/example/CQUPT/utils/AppUsageInfo.java
 create mode 100644 app/src/main/java/com/example/CQUPT/utils/KeyboardUtils.java

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index a30cbae..f5957a9 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-28T20:48:39.384739Z">
+        <DropdownSelection timestamp="2024-11-28T21:03:48.872764Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=84c6afd2" />
diff --git a/app/src/main/java/com/example/CQUPT/MainActivity.java b/app/src/main/java/com/example/CQUPT/MainActivity.java
index 41b3738..fac6d5a 100644
--- a/app/src/main/java/com/example/CQUPT/MainActivity.java
+++ b/app/src/main/java/com/example/CQUPT/MainActivity.java
@@ -16,11 +16,14 @@
 import androidx.preference.PreferenceManager;
 
 import com.example.CQUPT.databinding.ActivityMainBinding;
+import com.example.CQUPT.utils.AppUsageInfo;
 import com.example.CQUPT.utils.AppUsageManager;
 import com.example.CQUPT.utils.UsageWarningDialog;
 import com.google.android.material.navigation.NavigationView;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class MainActivity extends AppCompatActivity {
@@ -125,6 +128,7 @@ private void checkAppUsageWithPermission() {
             }
 
             int timeThreshold = sharedPreferences.getInt(PREF_TIME_THRESHOLD, 30); // 默认30分钟
+            List<AppUsageInfo> excessiveUsageApps = new ArrayList<>();
 
             for (String packageName : selectedApps) {
                 if (appUsageManager.isExcessiveUsage(packageName, timeThreshold)) {
@@ -132,14 +136,14 @@ private void checkAppUsageWithPermission() {
                     String usageTime = appUsageManager.getFormattedUsageTime(
                             appUsageManager.getTodayAppUsageTime(packageName)
                     );
-
-                    if (!isFinishing()) {
-                        UsageWarningDialog dialog = new UsageWarningDialog(this, appName, usageTime);
-                        dialog.show();
-                        break; // 只显示一个提醒
-                    }
+                    excessiveUsageApps.add(new AppUsageInfo(appName, usageTime));
                 }
             }
+
+            if (!excessiveUsageApps.isEmpty() && !isFinishing()) {
+                UsageWarningDialog dialog = new UsageWarningDialog(this, excessiveUsageApps);
+                dialog.show();
+            }
         } catch (Exception e) {
             android.util.Log.e("MainActivity", "Error in checkAppUsageWithPermission", e);
         }
diff --git a/app/src/main/java/com/example/CQUPT/ui/course/CourseSelectionFragment.java b/app/src/main/java/com/example/CQUPT/ui/course/CourseSelectionFragment.java
index cf2c0d1..21557c7 100644
--- a/app/src/main/java/com/example/CQUPT/ui/course/CourseSelectionFragment.java
+++ b/app/src/main/java/com/example/CQUPT/ui/course/CourseSelectionFragment.java
@@ -17,6 +17,7 @@
 
 import com.example.CQUPT.adapter.CourseSuccessAdapter;
 import com.example.CQUPT.databinding.FragmentCourseSelectionBinding;
+import com.example.CQUPT.utils.KeyboardUtils;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.Arrays;
@@ -77,6 +78,9 @@ public void onStopTrackingTouch(SeekBar seekBar) {}
     }
 
     private void startCourseSelection() {
+        // 收起键盘
+        KeyboardUtils.hideKeyboard(requireActivity());
+
         // 从SharedPreferences获取最新的Session
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
         String session = prefs.getString(PREF_SESSION_ID, "");
diff --git a/app/src/main/java/com/example/CQUPT/ui/login/LoginFragment.java b/app/src/main/java/com/example/CQUPT/ui/login/LoginFragment.java
index 8c38579..0da4e95 100644
--- a/app/src/main/java/com/example/CQUPT/ui/login/LoginFragment.java
+++ b/app/src/main/java/com/example/CQUPT/ui/login/LoginFragment.java
@@ -15,6 +15,7 @@
 import com.example.CQUPT.R;
 import com.example.CQUPT.databinding.FragmentLoginBinding;
 import com.example.CQUPT.ui.HttpUtil;
+import com.example.CQUPT.utils.KeyboardUtils;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.snackbar.Snackbar;
 
@@ -61,6 +62,9 @@ private void loadSavedData() {
     }
 
     private void handleLogin() {
+        // 收起键盘
+        KeyboardUtils.hideKeyboard(requireActivity());
+
         String username = binding.usernameInput.getText().toString();
         String password = binding.passwordInput.getText().toString();
 
diff --git a/app/src/main/java/com/example/CQUPT/ui/slideshow/SlideshowFragment.java b/app/src/main/java/com/example/CQUPT/ui/slideshow/SlideshowFragment.java
index 4513d63..a2f667c 100644
--- a/app/src/main/java/com/example/CQUPT/ui/slideshow/SlideshowFragment.java
+++ b/app/src/main/java/com/example/CQUPT/ui/slideshow/SlideshowFragment.java
@@ -13,6 +13,7 @@
 import androidx.lifecycle.ViewModelProvider;
 import com.example.CQUPT.databinding.FragmentLoadClassesBinding;
 import com.example.CQUPT.ui.HttpUtil;
+import com.example.CQUPT.utils.KeyboardUtils;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.io.File;
@@ -43,6 +44,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
     }
 
     private void importCalendar() {
+        KeyboardUtils.hideKeyboard(requireActivity());
         String studentId = binding.studentIdInput.getText().toString();
         if (studentId.isEmpty()) {
             showMessage("请输入学号");
@@ -63,6 +65,7 @@ private void importCalendar() {
     }
 
     private void shareCalendar() {
+        KeyboardUtils.hideKeyboard(requireActivity());
         String studentId = binding.studentIdInput.getText().toString();
         if (studentId.isEmpty()) {
             showMessage("请输入学号");
diff --git a/app/src/main/java/com/example/CQUPT/utils/AppUsageInfo.java b/app/src/main/java/com/example/CQUPT/utils/AppUsageInfo.java
new file mode 100644
index 0000000..7b50a86
--- /dev/null
+++ b/app/src/main/java/com/example/CQUPT/utils/AppUsageInfo.java
@@ -0,0 +1,19 @@
+package com.example.CQUPT.utils;
+
+public class AppUsageInfo {
+    private final String appName;
+    private final String usageTime;
+
+    public AppUsageInfo(String appName, String usageTime) {
+        this.appName = appName;
+        this.usageTime = usageTime;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public String getUsageTime() {
+        return usageTime;
+    }
+}
diff --git a/app/src/main/java/com/example/CQUPT/utils/KeyboardUtils.java b/app/src/main/java/com/example/CQUPT/utils/KeyboardUtils.java
new file mode 100644
index 0000000..343d39e
--- /dev/null
+++ b/app/src/main/java/com/example/CQUPT/utils/KeyboardUtils.java
@@ -0,0 +1,30 @@
+package com.example.CQUPT.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+public class KeyboardUtils {
+    public static void hideKeyboard(Activity activity) {
+        if (activity == null) return;
+        
+        // 获取当前焦点的View
+        View currentFocus = activity.getCurrentFocus();
+        if (currentFocus != null) {
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
+            // 清除焦点
+            currentFocus.clearFocus();
+        }
+    }
+
+    public static void hideKeyboard(View view) {
+        if (view == null) return;
+        
+        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        // 清除焦点
+        view.clearFocus();
+    }
+}
diff --git a/app/src/main/java/com/example/CQUPT/utils/UsageWarningDialog.java b/app/src/main/java/com/example/CQUPT/utils/UsageWarningDialog.java
index 3e869e0..e3396bc 100644
--- a/app/src/main/java/com/example/CQUPT/utils/UsageWarningDialog.java
+++ b/app/src/main/java/com/example/CQUPT/utils/UsageWarningDialog.java
@@ -4,6 +4,9 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.text.SpannableStringBuilder;
+import android.text.style.StyleSpan;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,9 +17,11 @@
 
 import com.example.CQUPT.R;
 
+import java.util.List;
+
 public class UsageWarningDialog extends Dialog {
     
-    public UsageWarningDialog(Context context, String appName, String usageTime) {
+    public UsageWarningDialog(Context context, List<AppUsageInfo> appUsageInfoList) {
         super(context);
         
         requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -34,7 +39,28 @@ public UsageWarningDialog(Context context, String appName, String usageTime) {
         }
         
         TextView messageText = view.findViewById(R.id.message_text);
-        messageText.setText(String.format("今天已经使用%s %s了，\n要不要休息一下？", appName, usageTime));
+        SpannableStringBuilder message = new SpannableStringBuilder();
+        message.append("今天以下应用的使用时间已超过设定阈值：\n\n");
+        
+        for (int i = 0; i < appUsageInfoList.size(); i++) {
+            AppUsageInfo info = appUsageInfoList.get(i);
+            
+            // 应用名加粗
+            int start = message.length();
+            message.append(info.getAppName());
+            message.setSpan(new StyleSpan(Typeface.BOLD), start, message.length(), 0);
+            
+            message.append("：");
+            message.append(info.getUsageTime());
+            
+            // 如果不是最后一个应用，添加换行
+            if (i < appUsageInfoList.size() - 1) {
+                message.append("\n");
+            }
+        }
+        
+        message.append("\n\n要不要休息一下？");
+        messageText.setText(message);
         
         Button okButton = view.findViewById(R.id.ok_button);
         okButton.setOnClickListener(v -> dismiss());