From 8f22084d108c6d52da7e3e53250e245bcffe3e76 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Sat, 11 May 2024 16:37:31 +0800
Subject: [PATCH] Refactor(StoreCard): Optimize android qr-code url

---
 src/renderer/src/components/tools/LocalCard.tsx | 14 +++-----------
 src/renderer/src/components/tools/StoreCard.tsx | 11 +++--------
 src/renderer/src/util/navigation.ts             |  3 +++
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/renderer/src/components/tools/LocalCard.tsx b/src/renderer/src/components/tools/LocalCard.tsx
index 53642cf..7dc3efb 100644
--- a/src/renderer/src/components/tools/LocalCard.tsx
+++ b/src/renderer/src/components/tools/LocalCard.tsx
@@ -4,7 +4,7 @@ import Icon from '@ant-design/icons'
 import '@/assets/css/components/tools/local-card.scss'
 import { COLOR_BACKGROUND, COLOR_MAIN } from '@/constants/common.constants'
 import { checkDesktop, omitText } from '@/util/common'
-import { navigateToStore, navigateToView } from '@/util/navigation'
+import { getAndroidUrl, navigateToStore, navigateToView } from '@/util/navigation'
 import Card from '@/components/common/Card'
 import FlexBox from '@/components/common/FlexBox'
 import DragHandle from '@/components/dnd/DragHandle'
@@ -21,7 +21,6 @@ interface StoreCardProps extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement
     ver: string
     platform: Platform
     supportPlatform: Platform[]
-    favorite: boolean
 }
 
 const StoreCard = ({
@@ -44,7 +43,6 @@ const StoreCard = ({
     ver,
     platform,
     supportPlatform,
-    favorite,
     ...props
 }: StoreCardProps) => {
     const navigate = useNavigate()
@@ -67,10 +65,7 @@ const StoreCard = ({
                 title: 'Android 端',
                 content: (
                     <FlexBox className={'android-qrcode'}>
-                        <AntdQRCode
-                            value={`oxygen://openurl/view/${author.username}/${toolId}`}
-                            size={300}
-                        />
+                        <AntdQRCode value={getAndroidUrl(author.username, toolId)} size={300} />
                         <AntdTag className={'tag'}>请使用手机端扫描上方二维码</AntdTag>
                     </FlexBox>
                 ),
@@ -98,10 +93,7 @@ const StoreCard = ({
             title: 'Android 端',
             content: (
                 <FlexBox className={'android-qrcode'}>
-                    <AntdQRCode
-                        value={`oxygen://openurl/view/${author.username}/${toolId}`}
-                        size={300}
-                    />
+                    <AntdQRCode value={getAndroidUrl(author.username, toolId)} size={300} />
                     <AntdTag className={'tag'}>请使用手机端扫描上方二维码</AntdTag>
                 </FlexBox>
             ),
diff --git a/src/renderer/src/components/tools/StoreCard.tsx b/src/renderer/src/components/tools/StoreCard.tsx
index 1046600..eb1fcaf 100644
--- a/src/renderer/src/components/tools/StoreCard.tsx
+++ b/src/renderer/src/components/tools/StoreCard.tsx
@@ -12,6 +12,7 @@ import {
 import { checkDesktop, omitText } from '@/util/common'
 import { getLoginStatus, getUserId } from '@/util/auth'
 import {
+    getAndroidUrl,
     navigateToLogin,
     navigateToSource,
     navigateToStore,
@@ -96,10 +97,7 @@ const StoreCard = ({
                 title: 'Android 端',
                 content: (
                     <FlexBox className={'android-qrcode'}>
-                        <AntdQRCode
-                            value={`oxygen://openurl/view/${author.username}/${toolId}`}
-                            size={300}
-                        />
+                        <AntdQRCode value={getAndroidUrl(author.username, toolId)} size={300} />
                         <AntdTag className={'tag'}>请使用手机端扫描上方二维码</AntdTag>
                     </FlexBox>
                 ),
@@ -220,10 +218,7 @@ const StoreCard = ({
             title: 'Android 端',
             content: (
                 <FlexBox className={'android-qrcode'}>
-                    <AntdQRCode
-                        value={`oxygen://openurl/view/${author.username}/${toolId}`}
-                        size={300}
-                    />
+                    <AntdQRCode value={getAndroidUrl(author.username, toolId)} size={300} />
                     <AntdTag className={'tag'}>请使用手机端扫描上方二维码</AntdTag>
                 </FlexBox>
             ),
diff --git a/src/renderer/src/util/navigation.ts b/src/renderer/src/util/navigation.ts
index 8b667e8..8f2d5dc 100644
--- a/src/renderer/src/util/navigation.ts
+++ b/src/renderer/src/util/navigation.ts
@@ -153,3 +153,6 @@ export const getViewPath = (
 
     return `${url.pathname}${url.search}`
 }
+
+export const getAndroidUrl = (username: string, toolId: string) =>
+    `oxygen://opentool/${username}/${toolId}`