From c62e5c1e777feb84e73fd92fbd8ee8903f2fef14 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 8 May 2024 15:10:15 +0800
Subject: [PATCH 1/3] Refactor(StoreCard): Fix the bug that open android
 emulator automatically

Fix the bug that open android emulator automatically when click mask
---
 src/assets/css/components/tools/store-card.scss | 1 +
 src/components/tools/StoreCard.tsx              | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/components/tools/store-card.scss b/src/assets/css/components/tools/store-card.scss
index c42f825..f5c082e 100644
--- a/src/assets/css/components/tools/store-card.scss
+++ b/src/assets/css/components/tools/store-card.scss
@@ -32,6 +32,7 @@
         gap: 4px;
         opacity: 0;
         transition: all 0.2s;
+        z-index: 100;
 
         > *:hover {
           color: constants.$font-secondary-color;
diff --git a/src/components/tools/StoreCard.tsx b/src/components/tools/StoreCard.tsx
index 5572658..e2123f4 100644
--- a/src/components/tools/StoreCard.tsx
+++ b/src/components/tools/StoreCard.tsx
@@ -75,10 +75,9 @@ const StoreCard = ({
         }
         if (platform === 'ANDROID') {
             void modal.confirm({
+                centered: true,
                 icon: <Icon style={{ color: COLOR_MAIN }} component={IconOxygenInfo} />,
                 title: 'Android 端',
-                centered: true,
-                maskClosable: true,
                 content: (
                     <FlexBox className={'android-qrcode'}>
                         <AntdQRCode
@@ -147,10 +146,9 @@ const StoreCard = ({
     const handleOnAndroidBtnClick = (e: MouseEvent<HTMLDivElement>) => {
         e.stopPropagation()
         void modal.confirm({
+            centered: true,
             icon: <Icon style={{ color: COLOR_MAIN }} component={IconOxygenInfo} />,
             title: 'Android 端',
-            centered: true,
-            maskClosable: true,
             content: (
                 <FlexBox className={'android-qrcode'}>
                     <AntdQRCode
-- 
2.49.1


From 0ad19e24a0215b3101beea4f1db035b5e2eb3db8 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 8 May 2024 17:17:33 +0800
Subject: [PATCH 2/3] Refactor(Service): Add network error message

---
 src/services/index.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/services/index.tsx b/src/services/index.tsx
index 149a65e..db8d15e 100644
--- a/src/services/index.tsx
+++ b/src/services/index.tsx
@@ -126,6 +126,15 @@ service.interceptors.response.use(
             (error.code === 'ECONNABORTED' && error.message.includes('timeout'))
         ) {
             void message.error({ content: '请求超时，请稍后重试', key: 'TIMEOUT' })
+        } else if (error.code === 'ERR_NETWORK') {
+            void message.error({
+                content: (
+                    <>
+                        <strong>网络错误</strong>，请检查网络后重试
+                    </>
+                ),
+                key: 'NETWORK_ERROR'
+            })
         } else {
             void message.error({
                 content: (
-- 
2.49.1


From 386744d7022515505bf4b1f01cee9a15a313fbc3 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 8 May 2024 17:19:28 +0800
Subject: [PATCH 3/3] Refactor(Navigation): Optimize url operate

---
 src/util/navigation.ts | 44 ++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/util/navigation.ts b/src/util/navigation.ts
index fceb2fe..4f4b9b0 100644
--- a/src/util/navigation.ts
+++ b/src/util/navigation.ts
@@ -37,10 +37,15 @@ export const navigateToView = (
     version?: string,
     options?: NavigateOptions
 ) => {
-    navigate(
-        `/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
-        options
+    const url = new URL(
+        `/view/${username}/${toolId}${version ? `/${version}` : ''}`,
+        window.location.href
     )
+    if (platform !== import.meta.env.VITE_PLATFORM) {
+        url.searchParams.append('platform', platform)
+    }
+
+    navigate(`${url.pathname}${url.search}`, options)
 }
 
 export const navigateToSource = (
@@ -51,10 +56,14 @@ export const navigateToSource = (
     version?: string,
     options?: NavigateOptions
 ) => {
-    navigate(
-        `/source/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
-        options
+    const url = new URL(
+        `/source/${username}/${toolId}${version ? `/${version}` : ''}`,
+        window.location.href
     )
+    if (platform !== import.meta.env.VITE_PLATFORM) {
+        url.searchParams.append('platform', platform)
+    }
+    navigate(`${url.pathname}${url.search}`, options)
 }
 
 export const navigateToRedirect = (
@@ -104,10 +113,12 @@ export const navigateToEdit = (
     platform: Platform,
     options?: NavigateOptions
 ) => {
-    navigate(
-        `/edit/${toolId}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
-        options
-    )
+    const url = new URL(`/edit/${toolId}`, window.location.href)
+    if (platform !== import.meta.env.VITE_PLATFORM) {
+        url.searchParams.append('platform', platform)
+    }
+
+    navigate(`${url.pathname}${url.search}`, options)
 }
 
 export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => {
@@ -123,5 +134,14 @@ export const getViewPath = (
     toolId: string,
     platform: Platform,
     version?: string
-) =>
-    `/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`
+) => {
+    const url = new URL(
+        `/view/${username}/${toolId}${version ? `/${version}` : ''}`,
+        window.location.href
+    )
+    if (platform !== import.meta.env.VITE_PLATFORM) {
+        url.searchParams.append('platform', platform)
+    }
+
+    return `${url.pathname}${url.search}`
+}
-- 
2.49.1