fix: issues #2838 (#2886)

src/components/setting/mods/layout-viewer.tsx

@@ -22,6 +22,18 @@ import getSystem from "@/utils/get-system";
 
 const OS = getSystem();
 
+const getIcons = async (icon_dir: string, name: string) => {
+  const updateTime = localStorage.getItem(`icon_${name}_update_time`) || "";
+
+  const icon_png = await join(icon_dir, `${name}-${updateTime}.png`);
+  const icon_ico = await join(icon_dir, `${name}-${updateTime}.ico`);
+
+  return {
+    icon_png,
+    icon_ico,
+  };
+};
+
 export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
   const { t } = useTranslation();
   const { verge, patchVerge, mutateVerge } = useVerge();
@@ -37,13 +49,20 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
 
   async function initIconPath() {
     const appDir = await getAppDir();
+
     const icon_dir = await join(appDir, "icons");
-    const common_icon_png = await join(icon_dir, "common.png");
-    const common_icon_ico = await join(icon_dir, "common.ico");
-    const sysproxy_icon_png = await join(icon_dir, "sysproxy.png");
-    const sysproxy_icon_ico = await join(icon_dir, "sysproxy.ico");
-    const tun_icon_png = await join(icon_dir, "tun.png");
-    const tun_icon_ico = await join(icon_dir, "tun.ico");
+
+    const { icon_png: common_icon_png, icon_ico: common_icon_ico } =
+      await getIcons(icon_dir, "common");
+
+    const { icon_png: sysproxy_icon_png, icon_ico: sysproxy_icon_ico } =
+      await getIcons(icon_dir, "sysproxy");
+
+    const { icon_png: tun_icon_png, icon_ico: tun_icon_ico } = await getIcons(
+      icon_dir,
+      "tun",
+    );
+
     if (await exists(common_icon_ico)) {
       setCommonIcon(common_icon_ico);
     } else {
@@ -212,11 +231,13 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
                       },
                     ],
                   });
+
                   if (selected) {
                     await copyIconFile(`${selected}`, "common");
                     await initIconPath();
                     onChangeData({ common_tray_icon: true });
                     patchVerge({ common_tray_icon: true });
+                    console.log();
                   }
                 }
               }}

src/services/cmds.ts

@@ -199,7 +199,19 @@ export async function copyIconFile(
   path: string,
   name: "common" | "sysproxy" | "tun",
 ) {
-  return invoke<void>("copy_icon_file", { path, name });
+  const key = `icon_${name}_update_time`;
+  const previousTime = localStorage.getItem(key) || "";
+
+  const currentTime = String(Date.now());
+  localStorage.setItem(key, currentTime);
+
+  const iconInfo = {
+    name,
+    previous_t: previousTime,
+    current_t: currentTime,
+  };
+
+  return invoke<void>("copy_icon_file", { path, iconInfo });
 }
 
 export async function downloadIconCache(url: string, name: string) {