From e87cbf6cff4b411e42abea0863338f42cbfe7ded Mon Sep 17 00:00:00 2001
From: lixiao <932184220@qq.com>
Date: Wed, 5 Mar 2025 12:52:56 +0800
Subject: [PATCH] =?UTF-8?q?tcp=20=E9=94=99=E8=AF=AF=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/common/utils/request.ts | 86 +++++++++++-----------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/entry/src/main/ets/common/utils/request.ts b/entry/src/main/ets/common/utils/request.ts
index 1ed8d12d..bd5c79f8 100644
--- a/entry/src/main/ets/common/utils/request.ts
+++ b/entry/src/main/ets/common/utils/request.ts
@@ -109,47 +109,47 @@ export default async function request<T>(req: any): Promise<T> {
   //     reject(err)
   //   })
   // })
-  return tempRequest<T>(req)
-  if (!isError) {
-    return new Promise<T>((resolve, reject) => {
-      console.log("[http request] url: " + req.url)
-      console.log("[http request] http request start")
-      tempRequest<T>(req).then((response) => {
-        console.log("[http request] http request success")
-        resolve(response)
-      }).catch((error) => {
-        isError=true
-        connection.getDefaultNet((error: any, data: any) => {
-          if (error) {
-            console.error(`Failed Http. Code:${error.code}, message:${error.message}`);
-            return;
-          }
-          console.log("Http success" + JSON.stringify(data));
-        });
-        console.log("[http request] http request error: " + JSON.stringify(error))
-        console.log("[http request] start tcp resend")
-        tcpRequest<T>(req).then(response => {
-          console.log("[http request] tcp resend success")
-          resolve(response as T)
-        }).catch(err => {
-          console.log("[http request] tcp resend failed: " + JSON.stringify(err))
-          reject(err)
-        })
-      })
-    })
-  } else {
-    console.log("[http request] url: " + req.url)
-    console.log("[http request] only tcp request start")
-    return new Promise((resolve, reject) => {
-      tcpRequest(req).then(res=> {
-        console.log("[http request] only tcp request success")
-        resolve(res as T)
-      }).catch(err => {
-        console.log("[http request] only tcp request error")
-        reject(err)
-      })
-    })
-  }
+  // return tempRequest<T>(req)
+  // if (!isError) {
+  //   return new Promise<T>((resolve, reject) => {
+  //     console.log("[http request] url: " + req.url)
+  //     console.log("[http request] http request start")
+  //     tempRequest<T>(req).then((response) => {
+  //       console.log("[http request] http request success")
+  //       resolve(response)
+  //     }).catch((error) => {
+  //       isError=true
+  //       connection.getDefaultNet((error: any, data: any) => {
+  //         if (error) {
+  //           console.error(`Failed Http. Code:${error.code}, message:${error.message}`);
+  //           return;
+  //         }
+  //         console.log("Http success" + JSON.stringify(data));
+  //       });
+  //       console.log("[http request] http request error: " + JSON.stringify(error))
+  //       console.log("[http request] start tcp resend")
+  //       tcpRequest<T>(req).then(response => {
+  //         console.log("[http request] tcp resend success")
+  //         resolve(response as T)
+  //       }).catch(err => {
+  //         console.log("[http request] tcp resend failed: " + JSON.stringify(err))
+  //         reject(err)
+  //       })
+  //     })
+  //   })
+  // } else {
+  //   console.log("[http request] url: " + req.url)
+  //   console.log("[http request] only tcp request start")
+  //   return new Promise((resolve, reject) => {
+  //     tcpRequest(req).then(res=> {
+  //       console.log("[http request] only tcp request success")
+  //       resolve(res as T)
+  //     }).catch(err => {
+  //       console.log("[http request] only tcp request error")
+  //       reject(err)
+  //     })
+  //   })
+  // }
 
 
   if (!isError) {
@@ -160,7 +160,9 @@ export default async function request<T>(req: any): Promise<T> {
         console.log("[http request] tcp request success")
         resolve(response)
       }).catch((error) => {
-        isError = true
+        if (error.code === 2300007) {
+          isError = true
+        }
         // vs.playAudio({
         //   type: 1,
         //   name: 'voice/PLCError.mp3'