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(req: any): Promise { // reject(err) // }) // }) - return tempRequest(req) - if (!isError) { - return new Promise((resolve, reject) => { - console.log("[http request] url: " + req.url) - console.log("[http request] http request start") - tempRequest(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(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(req) + // if (!isError) { + // return new Promise((resolve, reject) => { + // console.log("[http request] url: " + req.url) + // console.log("[http request] http request start") + // tempRequest(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(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(req: any): Promise { 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'