Merge pull request #165 from Telephone2019/work

Work

Author: TelephoneTan

app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 30
         versionCode 3
-        versionName "3.6"
+        versionName "3.6.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/telephone/coursetable/FunctionMenu.java

@@ -445,28 +445,7 @@ public void run() {
                                     runOnUiThread(()->{
                                         parent.expandGroup(groupPosition, true);
 //                            parent.smoothScrollToPositionFromTop(groupPosition, 10);
-                                        MainActivity.clearRedPoint(
-                                                FunctionMenu.this,
-                                                (FrameLayout)v.findViewById(R.id.textView_group_text_frame)
-                                        );
-                                        List<Entry<String, List<List<String>>>> groups = adapter.getGroups();
-                                        String origin_key = groups.get(groupPosition).getKey();
-                                        List<List<String>> origin_value = groups.get(groupPosition).getValue();
-                                        groups.remove(groupPosition);
-                                        groups.add(groupPosition, Map.entry(origin_key.trim(), origin_value));
-                                        new Thread(()->{
-                                            switch (groupPosition){
-                                                case 2: // grades
-                                                    MyApp.getDb_compare().gradeTotalDao().readAll();
-                                                    break;
-                                                case 5: // exam
-                                                    MyApp.getDb_compare().examTotalDao().readAll();
-                                                    break;
-                                                default:
-                                                    // do nothing
-                                                    break;
-                                            }
-                                        }).start();
+                                        clearUnread(FunctionMenu.this, v, adapter, groupPosition);
                                     });
                                 }).start();
                             }
@@ -512,6 +491,34 @@ public void onClick(DialogInterface dialog, int which) {
         }).start();
     }
 
+    /**
+     * must be called from ui thread
+     */
+    public static void clearUnread(@NonNull AppCompatActivity activity, @NonNull View groupView, @NonNull FunctionMenuAdapter functionMenuAdapter, int groupPosition){
+        MainActivity.clearRedPoint(
+                activity,
+                (FrameLayout)groupView.findViewById(R.id.textView_group_text_frame)
+        );
+        List<Entry<String, List<List<String>>>> groups = functionMenuAdapter.getGroups();
+        String origin_key = groups.get(groupPosition).getKey();
+        List<List<String>> origin_value = groups.get(groupPosition).getValue();
+        groups.remove(groupPosition);
+        groups.add(groupPosition, Map.entry(origin_key.trim(), origin_value));
+        new Thread(()->{
+            switch (groupPosition){
+                case 2: // grades
+                    MyApp.getDb_compare().gradeTotalDao().readAll();
+                    break;
+                case 5: // exam
+                    MyApp.getDb_compare().examTotalDao().readAll();
+                    break;
+                default:
+                    // do nothing
+                    break;
+            }
+        }).start();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();

app/src/main/java/com/telephone/coursetable/FunctionMenuAdapter.java

@@ -134,7 +134,10 @@ public View getGroupView(int i, boolean isExpanded, View view, ViewGroup viewGro
             case 2:
                 ((ImageView)view.findViewById(R.id.group_image)).setImageResource(R.drawable.grades);
                 if (groups.get(i).getValue().isEmpty()){
-                    view.setOnClickListener(v -> Snackbar.make(v, "成绩单为空", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show());
+                    view.setOnClickListener(v -> {
+                        Snackbar.make(v, "成绩单为空", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show();
+                        FunctionMenu.clearUnread(menu, v, FunctionMenuAdapter.this, i);
+                    });
                 }
                 break;
             case 3:
@@ -146,7 +149,10 @@ public View getGroupView(int i, boolean isExpanded, View view, ViewGroup viewGro
             case 5:
                 ((ImageView)view.findViewById(R.id.group_image)).setImageResource(R.drawable.exam);
                 if (groups.get(i).getValue().isEmpty()){
-                    view.setOnClickListener(v -> Snackbar.make(v, "暂无考试安排", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show());
+                    view.setOnClickListener(v -> {
+                        Snackbar.make(v, "暂无考试安排", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show();
+                        FunctionMenu.clearUnread(menu, v, FunctionMenuAdapter.this, i);
+                    });
                 }
                 break;
             case 6:
@@ -155,7 +161,10 @@ public View getGroupView(int i, boolean isExpanded, View view, ViewGroup viewGro
             case 7:
                 ((ImageView)view.findViewById(R.id.group_image)).setImageResource(R.drawable.cet);
                 if (groups.get(i).getValue().isEmpty()){
-                    view.setOnClickListener(v -> Snackbar.make(v, "未查询到等级考试成绩", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show());
+                    view.setOnClickListener(v -> {
+                        Snackbar.make(v, "未查询到等级考试成绩", BaseTransientBottomBar.LENGTH_SHORT).setTextColor(Color.WHITE).show();
+                        FunctionMenu.clearUnread(menu, v, FunctionMenuAdapter.this, i);
+                    });
                 }
                 break;
             case 8: