Commit b006b9db authored by lujie's avatar lujie
Browse files

Merge branch 'feat-demo' into 'main'

feat(app):change exit

See merge request !4
parents b6899f00 cbf24ae4
...@@ -3,7 +3,6 @@ import { AbilityConstant, Want } from '@kit.AbilityKit'; ...@@ -3,7 +3,6 @@ import { AbilityConstant, Want } from '@kit.AbilityKit';
import { SetToGlobalThis } from 'tuanjieLib'; import { SetToGlobalThis } from 'tuanjieLib';
import { TuanjiePlayerAbilityBase } from 'tuanjieLib'; import { TuanjiePlayerAbilityBase } from 'tuanjieLib';
import { fastSdk, InitResult, LogUtil, WindowVersionCompat } from 'fastsdk'; import { fastSdk, InitResult, LogUtil, WindowVersionCompat } from 'fastsdk';
import { processMgr } from 'fastsdk/src/main/ets/utils/PageManager';
import { LoginResult } from 'fastsdk/src/main/ets/model/LoginResult'; import { LoginResult } from 'fastsdk/src/main/ets/model/LoginResult';
import { GoodsInfo } from 'fastsdk/src/main/ets/model/GoodsInfo'; import { GoodsInfo } from 'fastsdk/src/main/ets/model/GoodsInfo';
...@@ -100,7 +99,7 @@ export default class TuanjiePlayerAbility extends TuanjiePlayerAbilityBase { ...@@ -100,7 +99,7 @@ export default class TuanjiePlayerAbility extends TuanjiePlayerAbilityBase {
}, },
onExitSuccess: (result: string) => { onExitSuccess: (result: string) => {
LogUtil.info('退出成功:' + result); LogUtil.info('退出成功:' + result);
processMgr.exit(0) this.context.terminateSelf();
} }
}; };
fastSdk.hlAccountListener = { fastSdk.hlAccountListener = {
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
"specifiers": { "specifiers": {
"@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0", "@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0",
"@ohos/hypium@1.0.21": "@ohos/hypium@1.0.21", "@ohos/hypium@1.0.21": "@ohos/hypium@1.0.21",
"@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.3/oh_modules/fastsdk/libs/ShanYanSDK-signed.har": "@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.3/oh_modules/fastsdk/libs/ShanYanSDK-signed.har", "@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.4/oh_modules/fastsdk/libs/ShanYanSDK-signed.har": "@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.4/oh_modules/fastsdk/libs/ShanYanSDK-signed.har",
"cmccssosdk@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/quick_login_hm_1.0.6.har": "cmccssosdk@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/quick_login_hm_1.0.6.har", "cmccssosdk@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/quick_login_hm_1.0.6.har": "cmccssosdk@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/quick_login_hm_1.0.6.har",
"core@^1.0.26": "core@1.0.26", "core@^1.0.26": "core@1.0.26",
"ctaccount@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/ctaccount.har": "ctaccount@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/ctaccount.har", "ctaccount@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/ctaccount.har": "ctaccount@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/ctaccount.har",
"dljson@oh_modules/.ohpm/ctaccount@qccjk9bmoqtng+2vpbi+2wqjznsjx4thqhodhlvlvn0=/oh_modules/ctaccount/library/dlJson.har": "dljson@oh_modules/.ohpm/ctaccount@qccjk9bmoqtng+2vpbi+2wqjznsjx4thqhodhlvlvn0=/oh_modules/ctaccount/library/dlJson.har", "dljson@oh_modules/.ohpm/ctaccount@qccjk9bmoqtng+2vpbi+2wqjznsjx4thqhodhlvlvn0=/oh_modules/ctaccount/library/dlJson.har": "dljson@oh_modules/.ohpm/ctaccount@qccjk9bmoqtng+2vpbi+2wqjznsjx4thqhodhlvlvn0=/oh_modules/ctaccount/library/dlJson.har",
"fastsdk@^1.0.3": "fastsdk@1.0.3", "fastsdk@^1.0.4": "fastsdk@1.0.4",
"libaccess.so@oh_modules/.ohpm/core@1.0.26/oh_modules/core/src/main/cpp/types/libaccess": "libaccess.so@oh_modules/.ohpm/core@1.0.26/oh_modules/core/src/main/cpp/types/libaccess", "libaccess.so@oh_modules/.ohpm/core@1.0.26/oh_modules/core/src/main/cpp/types/libaccess": "libaccess.so@oh_modules/.ohpm/core@1.0.26/oh_modules/core/src/main/cpp/types/libaccess",
"pako@^2.1.0": "pako@2.1.0", "pako@^2.1.0": "pako@2.1.0",
"unicom_login_harmony@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/unicom_login_harmony_v1.0.4AR001B0214.har": "unicom_login_harmony@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/unicom_login_harmony_v1.0.4AR001B0214.har" "unicom_login_harmony@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/unicom_login_harmony_v1.0.4AR001B0214.har": "unicom_login_harmony@oh_modules/.ohpm/@shanyan+shanyansdk@ujh3ust1dee5hftvs0poqjguqpkkdwsj3mmijifb+4u=/oh_modules/@shanyan/shanyansdk/libs/unicom_login_harmony_v1.0.4AR001B0214.har"
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.21.har", "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.21.har",
"registryType": "ohpm" "registryType": "ohpm"
}, },
"@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.3/oh_modules/fastsdk/libs/ShanYanSDK-signed.har": { "@shanyan/shanyansdk@oh_modules/.ohpm/fastsdk@1.0.4/oh_modules/fastsdk/libs/ShanYanSDK-signed.har": {
"name": "@shanyan/shanyansdk", "name": "@shanyan/shanyansdk",
"version": "1.0.4", "version": "1.0.4",
"resolved": "oh_modules/.ohpm/fastsdk@1.0.3/oh_modules/fastsdk/libs/ShanYanSDK-signed.har", "resolved": "oh_modules/.ohpm/fastsdk@1.0.4/oh_modules/fastsdk/libs/ShanYanSDK-signed.har",
"registryType": "local", "registryType": "local",
"dependencies": { "dependencies": {
"unicom_login_harmony": "file:./libs/unicom_login_harmony_v1.0.4AR001B0214.har", "unicom_login_harmony": "file:./libs/unicom_login_harmony_v1.0.4AR001B0214.har",
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
"resolved": "", "resolved": "",
"registryType": "local" "registryType": "local"
}, },
"fastsdk@1.0.3": { "fastsdk@1.0.4": {
"name": "", "name": "",
"version": "1.0.3", "version": "1.0.4",
"integrity": "sha512-asCThK6xj3wgaKJmNpTe/5xAEarfeleWoFXbJoPbJB/kWt+Py+LTLSc0bVKX7GlHgenbhpGO8sqcXiNpllD6Fw==", "integrity": "sha512-gg8tFtUkupV3igxAoGr3z3tv0H005e/eA9eGNZ3G4+Y0znlfcTV5VAADlG09+3Lk6v/RhRwQsmfD52S0lefyWQ==",
"resolved": "https://ohrepo.hoolai.com/repos/ohpm/fastsdk/-/fastsdk-1.0.3.har", "resolved": "https://ohrepo.hoolai.com/repos/ohpm/fastsdk/-/fastsdk-1.0.4.har",
"registryType": "ohpm", "registryType": "ohpm",
"dependencies": { "dependencies": {
"@shanyan/shanyansdk": "file:./libs/ShanYanSDK-signed.har" "@shanyan/shanyansdk": "file:./libs/ShanYanSDK-signed.har"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"modelVersion": "5.1.0", "modelVersion": "5.1.0",
"description": "Please describe the basic information.", "description": "Please describe the basic information.",
"dependencies": { "dependencies": {
"fastsdk": "^1.0.3", "fastsdk": "^1.0.4",
"core": "^1.0.26" "core": "^1.0.26"
}, },
"devDependencies": { "devDependencies": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment