tcp 错误判断修改

This commit is contained in:
lixiao 2025-03-05 12:52:56 +08:00
parent 9c5ddd35d6
commit e87cbf6cff

View File

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