From 991eec4bdf3892a8cfd96e581953cc48f7507d1e Mon Sep 17 00:00:00 2001
From: jackd320 <jack.dai@huawei.com>
Date: Thu, 18 May 2023 13:02:47 +0000
Subject: [PATCH] Signed-off-by: jackd320 <jack.dai@huawei.com>

Signed-off-by: jackd320 <jack.dai@huawei.com>
---
 common/src/main/ets/manager/UpdateManager.ts | 19 ++++++++++---------
 common/src/main/ets/util/UpdateUtils.ets     | 10 ++++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/common/src/main/ets/manager/UpdateManager.ts b/common/src/main/ets/manager/UpdateManager.ts
index 9b17f0e..3c32f48 100644
--- a/common/src/main/ets/manager/UpdateManager.ts
+++ b/common/src/main/ets/manager/UpdateManager.ts
@@ -18,6 +18,7 @@ import update from '@ohos.update';
 import { PACKAGE_NAME, UpdateState, UpgradeCallResult, } from '../const/update_const';
 import type { BusinessError, OtaStatus, UpgradeData} from '../const/update_const';
 import { LogUtils } from '../util/LogUtils';
+import { UpdateUtils } from '../util/UpdateUtils';
 
 /**
  * 方法超时控制装饰器
@@ -227,19 +228,19 @@ export class UpdateManager implements IUpdate {
       language: descLanguage
     };
     return new Promise((resolve, reject) => {
-      this.otaUpdater?.getCurrentVersionDescription(options).then((result: Array<update.ComponentDescription>) => {
+      this.otaUpdater?.getCurrentVersionDescription(options, (err, result) => {
         this.log('getCurrentVersionDescription result:' + JSON.stringify(result));
         let upgradeData: UpgradeData<Array<update.ComponentDescription>> = {
           callResult: UpgradeCallResult.OK,
-          data: result
-        };
-        resolve(upgradeData);
-      }).catch((err: BusinessError) => {
-        this.logError('getCurrentVersionDescription err:' + JSON.stringify(err));
-        let upgradeData: UpgradeData<Array<update.ComponentDescription>> = {
-          callResult: UpgradeCallResult.ERROR,
-          error: err
+          data: result,
+          error: {
+            data: [{ errorCode: err?.data?.[0]?.errorCode }]
+          }
         };
+        if (!UpdateUtils.isSuccessCallback(result, err)) {
+          this.logError('getCurrentVersionDescription error is ${JSON.stringify(err)}');
+          upgradeData.callResult = UpgradeCallResult.ERROR;
+        }
         resolve(upgradeData);
       });
     });
diff --git a/common/src/main/ets/util/UpdateUtils.ets b/common/src/main/ets/util/UpdateUtils.ets
index 6932467..1537fdd 100644
--- a/common/src/main/ets/util/UpdateUtils.ets
+++ b/common/src/main/ets/util/UpdateUtils.ets
@@ -69,4 +69,14 @@ export namespace UpdateUtils {
       LogUtils.error(TAG, 'Failed to start ability with error: ' + JSON.stringify(error));
     });
   }
+
+  /**
+   * 接口调用结果判断
+   *
+   * @param err 返回信息
+   * @param return 接口调用结果
+   */
+  export function isSuccessCallback(result: unknow, err: any): boolean {
+    return result && !err;
+  }
 }
\ No newline at end of file
-- 
Gitee