From f420a9512fbea37f92dbf7da49337f3e17a6259e Mon Sep 17 00:00:00 2001
From: lv <1344032923@qq.com>
Date: Wed, 25 Jun 2025 10:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/common/utils/GlobalTcp.ts  | 22 ++++++++++++++-----
 entry/src/main/ets/common/utils/TcpClient.ts  |  4 ++--
 .../src/main/ets/entryability/EntryAbility.ts |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/entry/src/main/ets/common/utils/GlobalTcp.ts b/entry/src/main/ets/common/utils/GlobalTcp.ts
index eec03438..4c414ee6 100644
--- a/entry/src/main/ets/common/utils/GlobalTcp.ts
+++ b/entry/src/main/ets/common/utils/GlobalTcp.ts
@@ -3,7 +3,7 @@ import { getSyncData } from '../service/initable';
 import hilog from '@ohos.hilog';
 import FileUtil from '../../common/utils/File'
 import { GlobalConfig } from '../../config/index'
-
+const TAG = 'socketTag[TcpDemo.TcpClient]'
 export async function getTCP(flag=false) {
   globalThis.getCloseTcp=true
   const fileUtil = new FileUtil(globalThis.context)
@@ -35,10 +35,16 @@ export async function getTCP(flag=false) {
           console.log('ttttttt00')
 
           clearInterval(globalThis.intervalSendmsg)
-          globalThis.intervalSendmsg=setInterval(()=>{
+          globalThis.intervalSendmsg=setInterval(async()=>{
             console.log('getCloseTcp',globalThis.carInfo.carNo)
             if(!globalThis.getCloseTcp){
-              globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
+              await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
+              globalThis.tcpStep+=1
+              if(globalThis.tcpStep>30){
+                console.log(TAG,'tcp重连开始')
+                globalThis.tcpStep=0
+                getTCP()
+              }
             }
           },1000/3)
           globalThis.TcpClient.onError((val) => {
@@ -68,10 +74,16 @@ export async function getTCP(flag=false) {
       console.log('ttttttt12')
 
       clearInterval(globalThis.intervalSendmsg)
-      globalThis.intervalSendmsg=setInterval(()=>{
+      globalThis.intervalSendmsg=setInterval(async()=>{
         // console.log('getCloseTcp',globalThis.getCloseTcp)
         if(!globalThis.getCloseTcp){
-          globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
+          await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
+          globalThis.tcpStep+=1
+          if(globalThis.tcpStep>30){
+            console.log(TAG,'tcp重连开始')
+            globalThis.tcpStep=0
+            getTCP()
+          }
         }
       },1000/3)
       globalThis.TcpClient.onError((val) => {
diff --git a/entry/src/main/ets/common/utils/TcpClient.ts b/entry/src/main/ets/common/utils/TcpClient.ts
index f14066b8..043d40c1 100644
--- a/entry/src/main/ets/common/utils/TcpClient.ts
+++ b/entry/src/main/ets/common/utils/TcpClient.ts
@@ -148,13 +148,12 @@ export default class TcpClient {
           this.tcpSendNum=0
           return
         }
-        globalThis.getCloseTcp=true
         console.log(`${TAG} TCPsend error ${JSON.stringify(err)}`)
         // this.writeLog({
         //   time:dateFormat(new Date()),
         //   message: `${TAG} TCPsend error ${JSON.stringify(err)}`,
         // })
-        reslove(false)
+        reject(false)
       });
     })
   }
@@ -165,6 +164,7 @@ export default class TcpClient {
       //   time:dateFormat(new Date()),
       //   PLC:`${TAG} Tcponmessage`,
       // })
+      globalThis.tcpStep=0
       globalThis.tcpUdpError = false
       if (value) {
         callback && callback(value.message)
diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts
index 9e7393e9..ae3360a5 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ts
+++ b/entry/src/main/ets/entryability/EntryAbility.ts
@@ -38,7 +38,7 @@ export default class EntryAbility extends UIAbility {
     // Main window is created, set main page for this ability
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
     await tcpUtil.init()
-
+    globalThis.tcpStep=0
 
     globalThis.carInfo = {}
     globalThis.examinerInfo = {}