From 850682cc510b7cab5f3fec04a419a844dc4954cf Mon Sep 17 00:00:00 2001
From: Seven <qiqiwatermelon@gmail.com>
Date: Wed, 14 Jan 2026 22:42:15 +0700
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5=20tradeWebSocket?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=A4=E6=98=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                 |  1 +
 src/main.ts                 | 61 ++++++++++++-------------------------
 src/tradingview/datafeed.ts | 25 +++++++--------
 src/views/trade/index.vue   | 13 +++++++-
 4 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b63a5b8..b570086 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { App as CapacitorApp } from "@capacitor/app";
+import { tradeWebSocket } from "./tradingview/websocket";
 
 const userStore = useUserStore();
 const { isAuthenticated } = storeToRefs(userStore);
diff --git a/src/main.ts b/src/main.ts
index eb3198d..992a3d1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -72,49 +72,26 @@ if (import.meta.env.DEV) {
   console.log("VConsole is enabled in development mode.");
 }
 
-function initTradingView() {
-  const { VITE_TRADINGVIEW_LIBRARY_URL } = useEnv();
-  const promise1 = new Promise((resolve) => {
-    const script = document.createElement("script");
-    script.type = "text/javascript";
-    script.src = `${VITE_TRADINGVIEW_LIBRARY_URL}/charting_library/charting_library.standalone.js`;
-    script.async = true;
-    document.body.appendChild(script);
-    script.onload = () => resolve(true);
-  });
-  const promise2 = new Promise((resolve) => {
-    const script = document.createElement("script");
-    script.type = "text/javascript";
-    script.src = `${VITE_TRADINGVIEW_LIBRARY_URL}/datafeeds/udf/bundle.js`;
-    script.async = true;
-    document.body.appendChild(script);
-    script.onload = () => resolve(true);
-  });
-  return Promise.all([promise1, promise2]);
-}
+authClient.getSession().then((session) => {
+  const pinia = createPinia();
+  const userStore = useUserStore(pinia);
+  userStore.setToken(session.data?.session.token || "");
 
-initTradingView().then(() => {
-  authClient.getSession().then((session) => {
-    const pinia = createPinia();
-    const userStore = useUserStore(pinia);
-    userStore.setToken(session.data?.session.token || "");
+  const app = createApp(App)
+    .use(IonicVue, {
+      backButtonText: "返回",
+      mode: "ios",
+      statusTap: true,
+      swipeBackEnabled: true,
+      // rippleEffect: true,
+      // animated: false,
+    })
+    .use(uiComponents)
+    .use(pinia)
+    .use(router)
+    .use(i18n);
 
-    const app = createApp(App)
-      .use(IonicVue, {
-        backButtonText: "返回",
-        mode: "ios",
-        statusTap: true,
-        swipeBackEnabled: true,
-        // rippleEffect: true,
-        // animated: false,
-      })
-      .use(uiComponents)
-      .use(pinia)
-      .use(router)
-      .use(i18n);
-
-    router.isReady().then(() => {
-      app.mount("#app");
-    });
+  router.isReady().then(() => {
+    app.mount("#app");
   });
 });
diff --git a/src/tradingview/datafeed.ts b/src/tradingview/datafeed.ts
index 63c64fc..8d7202d 100644
--- a/src/tradingview/datafeed.ts
+++ b/src/tradingview/datafeed.ts
@@ -213,18 +213,18 @@ export class RWADatafeed extends Datafeeds.UDFCompatibleDatafeed {
     }]);
 
     tradeWebSocket.subscribe((message) => {
-      const data = message.data as any;
-      if (data.type !== "bar")
-        return;
-      const bar: Bar = {
-        time: data.bar.time,
-        open: data.bar.open,
-        high: data.bar.high,
-        low: data.bar.low,
-        close: data.bar.close,
-        volume: data.bar.volume,
-      };
-      onTick(bar);
+      const data = message.data;
+      if (data.channel === "bar") {
+        const bar: Bar = {
+          time: data.ts,
+          open: data.open,
+          high: data.high,
+          low: data.low,
+          close: data.close,
+          volume: data.volume,
+        };
+        onTick(bar);
+      }
     }, subscriberUID);
   }
 
@@ -234,5 +234,6 @@ export class RWADatafeed extends Datafeeds.UDFCompatibleDatafeed {
   unsubscribeBars(subscriberUID: string): void {
     console.log("[RWADatafeed]: unsubscribeBars", subscriberUID);
     tradeWebSocket.unsubscribe(subscriberUID);
+    this.subscribers.delete(subscriberUID);
   }
 }
diff --git a/src/views/trade/index.vue b/src/views/trade/index.vue
index 5876a67..a8e35a9 100644
--- a/src/views/trade/index.vue
+++ b/src/views/trade/index.vue
@@ -3,13 +3,14 @@ import type { ChartingLibraryWidgetOptions } from "#/charting_library";
 import type { SpotOrderBody } from "@/api/types";
 import type { TradingViewInst } from "@/tradingview/index";
 import type { ModalInstance } from "@/utils";
-import { modalController } from "@ionic/vue";
+import { modalController, onIonViewDidLeave, onIonViewWillEnter } from "@ionic/vue";
 import { useRouteQuery } from "@vueuse/router";
 import { caretDownOutline, ellipsisHorizontal } from "ionicons/icons";
 import MaterialSymbolsCandlestickChartOutline from "~icons/material-symbols/candlestick-chart-outline";
 import { client, safeClient } from "@/api";
 import { TradeTypeEnum } from "@/api/enum";
 import { TradingViewChart } from "@/tradingview/index";
+import { tradeWebSocket } from "@/tradingview/websocket";
 import ConfirmOrder from "./components/confirm-order.vue";
 import OrderBook from "./components/order-book.vue";
 import OrdersPanel from "./components/orders-panel.vue";
@@ -126,6 +127,16 @@ function signIn() {
     query: { redirect: router.currentRoute.value.fullPath },
   });
 }
+
+// onIonViewWillEnter(() => {
+//   console.log("进入交易页面，重新加载数据");
+//   tradingViewInst.value?.widget.value?.activeChart()?.resetData();
+// });
+
+// onIonViewDidLeave(() => {
+//   console.log("离开交易页面");
+//   tradingViewInst.value?.widget.value?.chart().restoreChart();
+// });
 </script>
 
 <template>