ref |> mPaaS升级工具封装

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>

@@ -54,4 +54,4 @@ export { NetworkType } from './src/main/ets/network/NetworkType'
 
 
 export { MpaasUtils } from './src/main/ets/mpaas/MpaasUtils'
 export { MpaasUtils } from './src/main/ets/mpaas/MpaasUtils'
 
 
-export { MpaasUpgradeCheck } from './src/main/ets/mpaas/MpaasUpgradeCheck'
+export { MpaasUpgradeCheck, UpgradeTipContent } from './src/main/ets/mpaas/MpaasUpgradeCheck'

 import { MPUpgradeService } from '@mpaas/upgrade'
 import { MPUpgradeService } from '@mpaas/upgrade'
-import { MpaasUtils } from './MpaasUtils'
+import { upgradeRes } from '@mpaas/upgrade/src/main/ets/t4/a'
+import { AppUtils } from '../utils/AppUtils'
+import { SPHelper } from '../utils/SPHelper'
+
+export interface UpgradeTipContent {
+
+  content: string
+  newVersion: string
+  downloadUrl: string
+  forceUpgrade: boolean
+}
 
 
 export class MpaasUpgradeCheck {
 export class MpaasUpgradeCheck {
 
 
@@ -12,33 +22,72 @@ export class MpaasUpgradeCheck {
     }
     }
   }
   }
 
 
-  async checkNewVersion() {
-    const utdid = await MpaasUtils.mpaasUtdid()
-    console.log("mpaas utdid: ", utdid)
+  checkNewVersion(): Promise<UpgradeTipContent | null> {
 
 
-    MPUpgradeService.checkNewVersion().then((response)=>{
-      let str = JSON.stringify(response)
-      console.log("mpaas upgrade check", str)
-      AlertDialog.show(
+    return new Promise((resolve, fail) => {
+      MPUpgradeService.checkNewVersion().then((response)=>{
+        let str = JSON.stringify(response)
+        console.log("mpaas upgrade check", str)
+
+        /*
         {
         {
-          title: '升级检测结果',
-          message: str,
-          autoCancel: true,
-          offset: { dx: 0, dy: -20 },
-          gridCount: 3,
-          confirm: {
-            value: '确认',
-            action: () => {
-              console.info('upgrade result',response)
-            }
-          },
-          cancel: () => {
-            console.info('Closed callbacks')
+            "android64FileSize": 0,
+            "downloadURL": "https://appgallery.huawei.com/#/app",
+            "fileSize": 0,
+            "fullMd5": "no md5",
+            "guideMemo": "欢迎使用新版本",
+            "isWifi": 0,
+            "netType": "ALL",
+            "newestVersion": "1.0.1",
+            "resultStatus": 204,
+            "silentType": 0,
+            "upgradeVersion": "1.0.1"
+        }*/
+
+        let res = response as upgradeRes
+
+        // AliUpgradeNewVersion = 201, /*当前使用的已是最新版本*/
+        // AliUpgradeOneTime = 202, /*客户端已有新版本，单次提醒*/
+        // AliUpgradeForceUpdate = 203, /*客户端已有新版本，强制升级（已废弃）*/
+        // AliUpgradeEveryTime = 204, /*客户端已有新版本，多次提醒*/
+        // AliUpgradeRejectLogin = 205, /*限制登录(已废弃)*/
+        // AliUpgradeForceUpdateWithLogin = 206 /*客户端已有新版本，强制升级*/
+
+        const currentAppVersoin = AppUtils.getAppVersionName()
+
+        if (res.resultStatus == 201) {
+          resolve(null)
+          return
+        }
+
+        // 单次升级控制
+        if (res.resultStatus == 202) {
+          const oldOnceValue = SPHelper.default.getSync("upgradeOnceKey", false) as boolean
+          if (true == oldOnceValue) {
+            resolve(null)
+            return
+          }
+          SPHelper.default.save("upgradeOnceKey", true)
+        } else {
+          SPHelper.default.save("upgradeOnceKey", false)
+        }
+
+        if (res.resultStatus == 202 || res.resultStatus == 204 || res.resultStatus == 206) {
+          let content: UpgradeTipContent = {
+            content: res.guideMemo,
+            newVersion: res.upgradeVersion,
+            downloadUrl: res.downloadURL,
+            forceUpgrade: res.resultStatus == 206
           }
           }
+          resolve(content)
+          return
         }
         }
-      )
-    }).catch((error: Error) => {
-      console.log("mpaas upgrade fail", `name: ${error.name}, message: ${error.message}, \nstack: ${error.stack}`)
+
+        resolve(null)
+      }).catch((error: Error) => {
+        console.log("mpaas upgrade fail", `name: ${error.name}, message: ${error.message}, \nstack: ${error.stack}`)
+        fail("检测升级失败")
+      })
     })
     })
   }
   }
 }
 }

 import { MPFramework } from '@mpaas/framework'
 import { MPFramework } from '@mpaas/framework'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
 
 
+/*
+对接mpaas注意：
+* 1、后台创建mpaas.config，需要包名。放到rawfile目录
+* 2、网关加密hs_1222.png图片，放到rawfile目录
+* 3. 配置和加密图片，需要包名和签名对应，否则无法使用
+ * */
+
 export class MpaasUtils {
 export class MpaasUtils {
 
 
   // 启动时onCreate()方法调用
   // 启动时onCreate()方法调用

@@ -53,5 +53,16 @@ export class AppUtils {
     }
     }
     return '';
     return '';
   }
   }
+
+  static getFingerprint(): string {
+    try {
+      let bundleInfo =
+        bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_SIGNATURE_INFO);
+      let finger = bundleInfo.signatureInfo.fingerprint;
+    } catch (e) {
+      Logger.warn(TAG, 'get app signatureinfo error:' + e?.message);
+    }
+    return '';
+  }
 }
 }
 
 

@@ -5,7 +5,7 @@ import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger, MpaasUpgradeChe
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { promptAction } from '@kit.ArkUI';
 import { promptAction } from '@kit.ArkUI';
 import { HWLocationUtils } from 'wdHwAbility/Index';
 import { HWLocationUtils } from 'wdHwAbility/Index';
-
+import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 
@@ -16,6 +16,7 @@ struct MainPage {
   @Provide pageHide: number = -1
   @Provide pageHide: number = -1
   private breakpointSystem: BreakpointSystem = new BreakpointSystem()
   private breakpointSystem: BreakpointSystem = new BreakpointSystem()
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
+  upgradeDialogController?: CustomDialogController
 
 
   watchCurrentBreakpoint() {
   watchCurrentBreakpoint() {
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
@@ -44,8 +45,25 @@ struct MainPage {
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
     this.pageShow = Math.random()
     this.pageShow = Math.random()
 
 
+    // TODO: 升级检查，暂时不开放
+    // this.upgradeCheck()
+  }
+
+  upgradeCheck() {
     const mpaas = new MpaasUpgradeCheck()
     const mpaas = new MpaasUpgradeCheck()
-    mpaas.checkNewVersion()
+    mpaas.checkNewVersion().then((data) => {
+      if (data != null) {
+
+        this.upgradeDialogController = new CustomDialogController({
+          builder: UpgradeTipDialog({
+            tipContent:data
+          })
+        })
+        this.upgradeDialogController?.open()
+      }
+    }).catch(() => {
+
+    })
   }
   }
 
 
   onBackPress() {
   onBackPress() {

+import { UpgradeTipContent } from 'wdKit/Index'
+
+@Preview
+@CustomDialog
+export struct UpgradeTipDialog {
+  private tipContent: UpgradeTipContent = {} as UpgradeTipContent
+  cancel?: () => void
+  confirm?: () => void
+  controller: CustomDialogController
+
+  build() {
+    Column() {
+      Text(this.tipContent.content).fontSize(20).margin({ top: 10, bottom: 10 })
+      Flex({ justifyContent: FlexAlign.SpaceAround }) {
+        Button('cancel')
+          .onClick(() => {
+            this.controller.close()
+            if (this.cancel) {
+              this.cancel()
+            }
+          }).backgroundColor(0xffffff).fontColor(Color.Black)
+        Button('立即升级')
+          .onClick(() => {
+            this.controller.close()
+            if (this.confirm) {
+              this.confirm()
+            }
+          }).backgroundColor(0xffffff).fontColor(Color.Red)
+      }.margin({ bottom: 10 })
+    }
+  }
+
+
+}