From ceb71d0c96c62d81792b9373f32f9305989b2d2f Mon Sep 17 00:00:00 2001
From: yang <yangweiping7@h-partners.com>
Date: Fri, 21 Feb 2025 11:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BAwarning=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yang <yangweiping7@h-partners.com>
---
 entry/src/main/ets/entryability/EntryAbility.ts |  4 +++-
 entry/src/main/ets/pages/UploadFile.ets         | 17 ++++++++++-------
 entry/src/main/ets/pages/index.ets              |  2 +-
 entry/src/main/ets/utils/log.ets                | 12 +++++++-----
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts
index a16f37f..f3a2c37 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ts
+++ b/entry/src/main/ets/entryability/EntryAbility.ts
@@ -16,7 +16,9 @@
 import UIAbility from '@ohos.app.ability.UIAbility';
 import hilog from '@ohos.hilog';
 import window from '@ohos.window';
-export let resourceManager:ESObject
+import rsManager from '@ohos.resourceManager';
+
+export let resourceManager:rsManager.ResourceManager;
 
 export default class EntryAbility extends UIAbility {
   onCreate(want, launchParam) {
diff --git a/entry/src/main/ets/pages/UploadFile.ets b/entry/src/main/ets/pages/UploadFile.ets
index c679d77..ce8c822 100644
--- a/entry/src/main/ets/pages/UploadFile.ets
+++ b/entry/src/main/ets/pages/UploadFile.ets
@@ -15,13 +15,16 @@
 import {FileUpload,File,FormData} from "@ohos/commons-fileupload"
 import { log, logError, debug } from "../utils/log"
 import * as EntryAbility from '../entryability/EntryAbility'
+import http from "@ohos.net.http";
+import { BusinessError } from "@ohos.base";
+
 @Entry
 @Component
 struct UploadFile {
   @State message: Resource = $r('app.string.File_upload')
   @State loadedFileResult: string = "";
   fileInfo: Array<File> = [];
-  fileUpload: FileUpload|ESObject
+  fileUpload: FileUpload | undefined = undefined;
 
   aboutToAppear() {
     this.fileUpload = new FileUpload({
@@ -67,13 +70,13 @@ struct UploadFile {
    * @param fileName
    */
   loadFileByResource(fileName: string): void {
-    EntryAbility.resourceManager.getRawFile(fileName, (error:ESObject, value:ESObject) => {
+    EntryAbility.resourceManager.getRawFileContent(fileName, (error:BusinessError, value:Uint8Array) => {
       if (error != null) {
         logError(error);
         this.loadedFileResult = this.getResourceString($r('app.string.failed'))
         return;
       }
-      const file:ESObject = new File();
+      const file:File = new File();
       file.fileName = fileName;
       file.fileData = value;
       this.fileInfo.push(file);
@@ -91,16 +94,16 @@ struct UploadFile {
     }
     log('检验通过')
 
-    const formData:ESObject = new FormData();
+    const formData: FormData = new FormData();
     formData.append("id", 1);
-    this.fileInfo.forEach((v:ESObject) => {
+    this.fileInfo.forEach((v:File) => {
       formData.append(v.fileName, v);
     })
     log("formData实例化完成，准备上传")
 
-    this.fileUpload.post("/api/upload", formData).then((res:ESObject) => {
+    this.fileUpload?.post("/api/upload", formData).then((res:http.HttpResponse) => {
       log("this.fileUpload.request 成功---" + JSON.stringify(res))
-    }).catch((err:ESObject) => {
+    }).catch((err:BusinessError) => {
       logError("this.fileUpload.request 失败" + JSON.stringify(err))
     })
 
diff --git a/entry/src/main/ets/pages/index.ets b/entry/src/main/ets/pages/index.ets
index 26bb4ad..2c291eb 100644
--- a/entry/src/main/ets/pages/index.ets
+++ b/entry/src/main/ets/pages/index.ets
@@ -37,7 +37,7 @@ struct Index {
 
   build() {
     Column({space:30}){
-      ForEach(this.menus,(v:ESObject) => {
+      ForEach(this.menus,(v:demo) => {
         this.BuildText(v.text,v.path);
       })
     }.width("100%").padding({top:50})
diff --git a/entry/src/main/ets/utils/log.ets b/entry/src/main/ets/utils/log.ets
index fcd569f..fb18a9e 100644
--- a/entry/src/main/ets/utils/log.ets
+++ b/entry/src/main/ets/utils/log.ets
@@ -1,3 +1,5 @@
+import { BusinessError } from "@ohos.base";
+
 /*
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the 'License');
@@ -14,19 +16,19 @@
  */
 const TAG = "COMMONS_FILEUPLOAD";
 
-export function log(value:ESObject){
+export function log(value:string){
   console.log(TAG + "----" + value);
 }
 
-export function logError(value:ESObject){
-  console.error(TAG + "----" + value);
+export function logError(value:string | BusinessError){
+  console.error(TAG + "----" + JSON.stringify(value));
 }
 
-export function logInfo(value:ESObject){
+export function logInfo(value:string){
   console.info(TAG + "----" + value);
 }
 
-export function debug(func:ESObject){
+export function debug(func:Function){
   if(typeof func !== "function") return;
   try{
     func();
-- 
Gitee