diff --git a/src/main/ets/http/HttpHelper.ets b/src/main/ets/http/HttpHelper.ets index 571ec71..bd58ec5 100644 --- a/src/main/ets/http/HttpHelper.ets +++ b/src/main/ets/http/HttpHelper.ets @@ -3,7 +3,7 @@ import http from '@ohos.net.http'; import { LogHelper } from '../../../../Index'; import { SZYXLocalStorageHelper } from '../utils/SZYXLocalStorageHelper'; import { SZYXLocalStorageKeys } from '../utils/SZYXLocalStorageKeys'; -import { HttpHelperX, HttpParamsForm, HttpParamsGet, HttpParamsPost } from './HttpHelperX'; +import { HttpHelperX, HttpParamsForm, HttpParamsGet, HttpParamsPost, HttpParamsUpload } from './HttpHelperX'; import { BusinessError } from '@kit.BasicServicesKit'; import { image } from '@kit.ImageKit'; @@ -314,7 +314,7 @@ export class HttpHelper { * @param apiNo 请求标识,取消请求或者去重使用|考虑做自动重试使用 * @returns */ - public upload(params: HttpParamsPost, apiNo?: string, showLog?: boolean): Promise { + public upload(params: HttpParamsUpload, apiNo?: string, showLog?: boolean): Promise { return new Promise((resolve, reject) => { @@ -340,17 +340,18 @@ export class HttpHelper { if (showLog) { LogHelper.debug(`postJson:${apiNo}\n`, JSON.stringify(params)) } + // let data = HttpHelperX.getContent(params.data) - const formData: http.MultiFormData[] = params.data as http.MultiFormData[] + // const formData: http.MultiFormData[] = params.data as http.MultiFormData[] httpRequest.request(HttpHelperX.getUrl(params.url, params.query), { method: http.RequestMethod.POST, connectTimeout: 20000, readTimeout: 20000, header: header, - // extraData: params.data, + extraData: params.data, usingCache: false, - multiFormDataList: formData, + multiFormDataList: params.data, }) .then((data: http.HttpResponse) => { if (showLog) { diff --git a/src/main/ets/http/HttpHelperX.ts b/src/main/ets/http/HttpHelperX.ts index ee7a016..5ac416f 100644 --- a/src/main/ets/http/HttpHelperX.ts +++ b/src/main/ets/http/HttpHelperX.ts @@ -1,4 +1,5 @@ import { ToolsHelperForTS } from '../utils/ToolsHelperForTS'; +import { http } from '@kit.NetworkKit'; export interface HttpParamsGet { url: string @@ -12,6 +13,12 @@ export interface HttpParamsPost { query?: Record | Object headers?: Record } +export interface HttpParamsUpload { + url: string + data: http.MultiFormData[] + query?: Record | Object + headers?: Record +} export interface HttpParamsForm { url: string diff --git a/src/main/ets/utils/FileHelper.ets b/src/main/ets/utils/FileHelper.ets index 7254824..a8b97a0 100644 --- a/src/main/ets/utils/FileHelper.ets +++ b/src/main/ets/utils/FileHelper.ets @@ -1,5 +1,6 @@ import fileUri from '@ohos.file.fileuri'; -import fs, { ListFileOptions, ReadOptions, ReadTextOptions, WriteOptions } from '@ohos.file.fs'; +import fs from '@ohos.file.fs'; +import fileIo, { ListFileOptions, ReadOptions, ReadTextOptions, WriteOptions } from '@ohos.file.fs'; import { BusinessError } from '@kit.BasicServicesKit'; import { StrHelper } from './StrHelper'; import { hilog } from '@kit.PerformanceAnalysisKit'; @@ -886,4 +887,18 @@ export class FileHelper { return (fileSize / (1024 * 1024 * 1024 * 1024)).toFixed(1) + "TB"; } } + + static copyFileToCacheDir(path: string):CacheFile { + const resFile = fileIo.openSync(path, fileIo.OpenMode.READ_ONLY) + let newPath = GlobalContext.getContext().cacheDir + "/" + resFile.name; + FileHelper.copyFileSync(resFile.fd, newPath) + return { + path: newPath, + name: resFile.name + } + } +} +export interface CacheFile{ + path:string, + name:string } \ No newline at end of file diff --git a/src/main/ets/utils/PickerHelper.ets b/src/main/ets/utils/PickerHelper.ets index e2cabcd..077071b 100644 --- a/src/main/ets/utils/PickerHelper.ets +++ b/src/main/ets/utils/PickerHelper.ets @@ -66,7 +66,7 @@ export class PickerHelper { let photoPicker = new photoAccessHelper.PhotoViewPicker(); let photoSelectResult: photoAccessHelper.PhotoSelectResult = await photoPicker.select(options); - LogHelper.error(JSON.stringify(photoSelectResult)) + // LogHelper.error(JSON.stringify(photoSelectResult)) if (photoSelectResult && photoSelectResult.photoUris && photoSelectResult.photoUris.length > 0) { return photoSelectResult.photoUris; } else {