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,16 +35,10 @@ export async function getTCP(flag=false) {
           console.log('ttttttt00')
 
           clearInterval(globalThis.intervalSendmsg)
-          globalThis.intervalSendmsg=setInterval(async()=>{
+          globalThis.intervalSendmsg=setInterval(()=>{
             console.log('getCloseTcp',globalThis.carInfo.carNo)
             if(!globalThis.getCloseTcp){
-              await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
-              globalThis.tcpStep+=1
-              if(globalThis.tcpStep>30){
-                console.log(TAG,'tcp重连开始')
-                globalThis.tcpStep=0
-                getTCP()
-              }
+              globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
             }
           },1000/3)
           globalThis.TcpClient.onError((val) => {
@@ -74,16 +68,10 @@ export async function getTCP(flag=false) {
       console.log('ttttttt12')
 
       clearInterval(globalThis.intervalSendmsg)
-      globalThis.intervalSendmsg=setInterval(async()=>{
+      globalThis.intervalSendmsg=setInterval(()=>{
         // console.log('getCloseTcp',globalThis.getCloseTcp)
         if(!globalThis.getCloseTcp){
-          await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
-          globalThis.tcpStep+=1
-          if(globalThis.tcpStep>30){
-            console.log(TAG,'tcp重连开始')
-            globalThis.tcpStep=0
-            getTCP()
-          }
+          globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
         }
       },1000/3)
       globalThis.TcpClient.onError((val) => {

entry/src/main/ets/common/utils/TcpClient.ts

@@ -148,12 +148,13 @@ 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)}`,
         // })
-        reject(false)
+        reslove(false)
       });
     })
   }
@@ -164,7 +165,6 @@ export default class TcpClient {
       //   time:dateFormat(new Date()),
       //   PLC:`${TAG} Tcponmessage`,
       // })
-      globalThis.tcpStep=0
       globalThis.tcpUdpError = false
       if (value) {
         callback && callback(value.message)

entry/src/main/ets/entryability/EntryAbility.ts

@@ -37,8 +37,6 @@ export default class EntryAbility extends UIAbility {
     // this.context
     // 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 = {}
@@ -66,15 +64,11 @@ export default class EntryAbility extends UIAbility {
     globalThis.pathDir = this.context.filesDir;
     globalThis.context = this.context;
     globalThis.isJudgeInitBool = false
-    console.info('jiangsong globalThis.pathDir = ' + globalThis.pathDir);
-    // this.requestPermission(this.context)
-    // this.featureAbilityAuth()
 
     const windowClass = await windowStage.getMainWindow();
     globalThis.windowClass = windowClass
-    // await windowClass.setWindowLayoutFullScreen(true)
-    // await windowClass.setWindowSystemBarEnable([]) //全屏
-    await windowClass.setWindowSystemBarEnable(['navigation'])
+    await windowClass.setWindowLayoutFullScreen(true)
+    await windowClass.setWindowSystemBarEnable([])
 
     windowStage.loadContent('pages/Index', (err, data) => {
       if (err.code) {