未验证 提交 50578a0a 编写于 作者: O openharmony_ci 提交者: Gitee

!7392 xts-包名整改

Merge pull request !7392 from chengxingzhen/master
{ {
"app": { "app": {
"bundleName": "com.example.amsabilitymultiinstanceappa", "bundleName": "com.acts.abilitymultiinstancea",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -22,8 +22,8 @@ function publishCallBack() { ...@@ -22,8 +22,8 @@ function publishCallBack() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -34,34 +34,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -34,34 +34,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
{ {
"module": { "module": {
"name": "com.example.amsabilitymultiinstanceappa", "name": "com.acts.abilitymultiinstancea",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.amsabilitymultiinstanceappa.MainAbility", "name": "com.acts.abilitymultiinstancea.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.amsabilitymultiinstanceappb", "bundleName": "com.acts.abilitymultiinstanceb",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -22,8 +22,8 @@ function publishCallBack() { ...@@ -22,8 +22,8 @@ function publishCallBack() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -34,34 +34,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -34,34 +34,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
{ {
"module": { "module": {
"name": "com.example.amsabilitymultiinstanceappb", "name": "com.acts.abilitymultiinstanceb",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.amsabilitymultiinstanceappb.MainAbility", "name": "com.acts.abilitymultiinstanceb.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.amsabilitymultiinstanceappc", "bundleName": "com.acts.abilitymultiinstancec",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -41,8 +41,8 @@ async function onShowProcess() { ...@@ -41,8 +41,8 @@ async function onShowProcess() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -53,34 +53,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -53,34 +53,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
{ {
"module": { "module": {
"name": "com.example.amsabilitymultiinstanceappc", "name": "com.acts.abilitymultiinstancec",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.amsabilitymultiinstanceappc.MainAbility", "name": "com.acts.abilitymultiinstancec.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.amsabilitymultiinstanceappd", "bundleName": "com.acts.abilitymultiinstanced",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -42,8 +42,8 @@ async function onShowProcess() { ...@@ -42,8 +42,8 @@ async function onShowProcess() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -54,34 +54,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -54,34 +54,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
...@@ -42,8 +42,8 @@ async function onShowProcess() { ...@@ -42,8 +42,8 @@ async function onShowProcess() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -54,34 +54,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -54,34 +54,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
...@@ -42,8 +42,8 @@ async function onShowProcess() { ...@@ -42,8 +42,8 @@ async function onShowProcess() {
} }
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -54,30 +54,30 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -54,30 +54,30 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
default: default:
......
{ {
"module": { "module": {
"name": "com.example.amsabilitymultiinstanceappd", "name": "com.acts.abilitymultiinstanced",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.amsabilitymultiinstanceappd.MainAbility", "name": "com.acts.abilitymultiinstanced.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
] ]
}, },
{ {
"name": "com.example.amsabilitymultiinstanceappd.SecondAbility", "name": "com.acts.abilitymultiinstanced.SecondAbility",
"srcEntrance": "./ets/SecondAbility/SecondAbility.ts", "srcEntrance": "./ets/SecondAbility/SecondAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
] ]
}, },
{ {
"name": "com.example.amsabilitymultiinstanceappd.ThirdAbility", "name": "com.acts.abilitymultiinstanced.ThirdAbility",
"srcEntrance": "./ets/ThirdAbility/ThirdAbility.ts", "srcEntrance": "./ets/ThirdAbility/ThirdAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.amsabilitymultiinstanceappe", "bundleName": "com.acts.abilitymultiinstancee",
"vendor": "example", "vendor": "example",
"version": { "version": {
"code": 1, "code": 1,
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
}, },
"deviceConfig": { "deviceConfig": {
"default": { "default": {
"process": "com.example.amsabilitymultiinstanceappe" "process": "com.acts.abilitymultiinstancee"
} }
}, },
"module": { "module": {
"package": "com.example.amsabilitymultiinstanceappe", "package": "com.acts.abilitymultiinstancee",
"name": ".MyApplication", "name": ".MyApplication",
"deviceType": [ "deviceType": [
"default", "default",
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
] ]
} }
], ],
"name": "com.example.amsabilitymultiinstanceappe.MainAbility", "name": "com.acts.abilitymultiinstancee.MainAbility",
"visible": true, "visible": true,
"icon": "$media:icon", "icon": "$media:icon",
"description": "$string:mainability_description", "description": "$string:mainability_description",
......
...@@ -24,8 +24,8 @@ function publishCallBack() { ...@@ -24,8 +24,8 @@ function publishCallBack() {
} }
async function startAbilityProcess(parameters) { async function startAbilityProcess(parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -36,34 +36,34 @@ async function startAbilityProcess(parameters) { ...@@ -36,34 +36,34 @@ async function startAbilityProcess(parameters) {
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
...@@ -24,8 +24,8 @@ const ONACCEPTWANT_KEY_UNDEFINED_ID = -2; ...@@ -24,8 +24,8 @@ const ONACCEPTWANT_KEY_UNDEFINED_ID = -2;
const UNSUBSCRIBE_TIMEOUT = 5000; const UNSUBSCRIBE_TIMEOUT = 5000;
async function startAbilityProcess(abilityContext, parameters) { async function startAbilityProcess(abilityContext, parameters) {
let bundleName = "com.example.amsabilitymultiinstanceappa"; let bundleName = "com.acts.abilitymultiinstancea";
let abilityName = "com.example.amsabilitymultiinstanceappa.MainAbility"; let abilityName = "com.acts.abilitymultiinstancea.MainAbility";
let idx = parameters.nextStep; let idx = parameters.nextStep;
switch (parameters.step[idx]) { switch (parameters.step[idx]) {
...@@ -45,34 +45,34 @@ async function startAbilityProcess(abilityContext, parameters) { ...@@ -45,34 +45,34 @@ async function startAbilityProcess(abilityContext, parameters) {
parameters.startId = ONACCEPTWANT_KEY_UNDEFINED_ID; parameters.startId = ONACCEPTWANT_KEY_UNDEFINED_ID;
break; break;
case "StartB": case "StartB":
bundleName = "com.example.amsabilitymultiinstanceappb"; bundleName = "com.acts.abilitymultiinstanceb";
abilityName = "com.example.amsabilitymultiinstanceappb.MainAbility"; abilityName = "com.acts.abilitymultiinstanceb.MainAbility";
break; break;
case "StartC": case "StartC":
bundleName = "com.example.amsabilitymultiinstanceappc"; bundleName = "com.acts.abilitymultiinstancec";
abilityName = "com.example.amsabilitymultiinstanceappc.MainAbility"; abilityName = "com.acts.abilitymultiinstancec.MainAbility";
break; break;
case "StartDMain1": case "StartDMain1":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 1; parameters.startId = 1;
break; break;
case "StartDMain2": case "StartDMain2":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.MainAbility"; abilityName = "com.acts.abilitymultiinstanced.MainAbility";
parameters.startId = 2; parameters.startId = 2;
break; break;
case "StartDSec": case "StartDSec":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.SecondAbility"; abilityName = "com.acts.abilitymultiinstanced.SecondAbility";
break; break;
case "StartDThd": case "StartDThd":
bundleName = "com.example.amsabilitymultiinstanceappd"; bundleName = "com.acts.abilitymultiinstanced";
abilityName = "com.example.amsabilitymultiinstanceappd.ThirdAbility"; abilityName = "com.acts.abilitymultiinstanced.ThirdAbility";
break; break;
case "StartE": case "StartE":
bundleName = "com.example.amsabilitymultiinstanceappe"; bundleName = "com.acts.abilitymultiinstancee";
abilityName = "com.example.amsabilitymultiinstanceappe.MainAbility"; abilityName = "com.acts.abilitymultiinstancee.MainAbility";
break; break;
default: default:
......
...@@ -388,111 +388,6 @@ export default function abilityTest() { ...@@ -388,111 +388,6 @@ export default function abilityTest() {
}) })
/*
* @tc.number : ACTS_startAbility_3000
* @tc.name : start new ability
* @tc.desc : Start an ability with the parameter startability with options succeeded.(promise)
*/
it('ACTS_startAbility_3000', 0, async function (done) {
let TAG = 'ACTS_startAbility_3000'
let Subscriber
var flag = true
var startresult = false
function SubscribeCallBack (err, data) {
expect(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent" || data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue();
console.debug(TAG + "====>0100 Subscribe CallBack data:====>" + JSON.stringify(data));
if(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent"){
startresult = true
}
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
}
commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => {
console.debug(TAG + "====>Create Subscriber====>");
data.getSubscribeInfo().then(async (SubscribeInfo)=>{
console.debug(TAG + "====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo));
Subscriber = data;
commonEvent.subscribe(Subscriber, SubscribeCallBack);
console.debug(TAG + "====>start startAbility====>");
await globalThis.abilityContext.startAbility(
{
bundleName: 'com.example.userservicesystemapi7',
abilityName: 'com.example.userservicesystemapi7.ServiceAbility'
}).then(()=>{
console.debug(TAG + "====>startAbility end====>");
})
})
})
function UnSubscribeCallback() {
console.debug(TAG + "====>UnSubscribeCallback====>");
flag = false
expect(startresult).assertEqual(true);
done();
}
function timeout() {
if(flag == true) {
expect().assertFail();
console.debug(TAG + 'ACTS_startAbility_3000 - timeout');
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
}
}
setTimeout(timeout, START_ABILITY_TIMEOUT);
})
/*
* @tc.number : ACTS_startAbility_3100
* @tc.name : start new ability
* @tc.desc : Start an ability with the parameter startability with options succeeded.(promise)
*/
it('ACTS_startAbility_3100', 0, async function (done) {
let TAG = 'ACTS_startAbility_3100'
let Subscriber
var flag = true
var startresult = false
function SubscribeCallBack (err, data) {
expect(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent" || data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue();
console.debug(TAG + "====>0100 Subscribe CallBack data:====>" + JSON.stringify(data));
if(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent"){
startresult = true
}
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
}
commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => {
console.debug(TAG + "====>Create Subscriber====>");
data.getSubscribeInfo().then(async (SubscribeInfo)=>{
console.debug(TAG + "====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo));
Subscriber = data;
commonEvent.subscribe(Subscriber, SubscribeCallBack);
console.debug(TAG + "====>start startAbility====>");
await globalThis.abilityContext.startAbility(
{
bundleName: 'com.example.userservicesystemapi7',
abilityName: 'com.example.userservicesystemapi7.ServiceAbility'
},()=>{
console.debug(TAG + "====>startAbility end====>");
})
})
})
function UnSubscribeCallback() {
console.debug(TAG + "====>UnSubscribeCallback====>");
flag = false
expect(startresult).assertEqual(true);
done();
}
function timeout() {
if(flag == true) {
expect().assertFail();
console.debug(TAG + 'ACTS_startAbility_3100 - timeout');
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
}
}
setTimeout(timeout, START_ABILITY_TIMEOUT);
})
/* /*
* @tc.number : ACTS_StartAbilityForResult_0100 * @tc.number : ACTS_StartAbilityForResult_0100
* @tc.name : start new ability for result * @tc.name : start new ability for result
......
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
{ {
"name": "ohos.permission.GET_RUNNING_INFO", "name": "ohos.permission.GET_RUNNING_INFO",
"reason": "need use ohos.permission.GET_RUNNING_INFO" "reason": "need use ohos.permission.GET_RUNNING_INFO"
},
{
"name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
"reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
} }
] ]
} }
......
{ {
"app":{ "app":{
"bundleName":"com.example.staticabilitystagecontext", "bundleName":"com.acts.stabilitystagecontext",
"vendor":"huawei", "vendor":"huawei",
"versionCode":1000000, "versionCode":1000000,
"versionName":"1.0.0", "versionName":"1.0.0",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "180000", "test-timeout": "180000",
"bundle-name": "com.example.staticabilitystagecontext", "bundle-name": "com.acts.stabilitystagecontext",
"module-name": "com.example.staticabilitystagecontext", "module-name": "com.acts.stabilitystagecontext",
"shell-timeout": "600000", "shell-timeout": "600000",
"testcase-timeout": 70000 "testcase-timeout": 70000
}, },
......
...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner { ...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner {
onAbilityCreate: onAbilityCreateCallback, onAbilityCreate: onAbilityCreateCallback,
}; };
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a com.example.staticabilitystagecontext.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName var cmd = 'aa start -d 0 -a com.acts.stabilitystagecontext.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"] var debug = abilityDelegatorArguments.parameters["-D"]
if (debug == 'true') if (debug == 'true')
......
...@@ -91,7 +91,7 @@ export default function abilityTest() { ...@@ -91,7 +91,7 @@ export default function abilityTest() {
expect(typeof (data.removable)).assertEqual("boolean"); expect(typeof (data.removable)).assertEqual("boolean");
console.log("checkApplicationInfo_expect_typeof_end") console.log("checkApplicationInfo_expect_typeof_end")
expect(data.name).assertEqual("com.example.staticabilitystagecontext"); expect(data.name).assertEqual("com.acts.stabilitystagecontext");
expect(data.description).assertEqual("$string:description_application"); expect(data.description).assertEqual("$string:description_application");
expect(data.descriptionId).assertLarger(0); expect(data.descriptionId).assertLarger(0);
expect(data.systemApp).assertEqual(true); expect(data.systemApp).assertEqual(true);
...@@ -100,12 +100,12 @@ export default function abilityTest() { ...@@ -100,12 +100,12 @@ export default function abilityTest() {
expect(data.labelId.length).assertLarger(0); expect(data.labelId.length).assertLarger(0);
expect(data.icon).assertEqual("$media:icon"); expect(data.icon).assertEqual("$media:icon");
expect(data.iconId.length).assertLarger(0); expect(data.iconId.length).assertLarger(0);
expect(data.process).assertEqual("com.example.staticabilitystagecontext"); expect(data.process).assertEqual("com.acts.stabilitystagecontext");
expect(data.supportedModes).assertEqual(0); expect(data.supportedModes).assertEqual(0);
expect(data.moduleInfos.length).assertEqual(1); expect(data.moduleInfos.length).assertEqual(1);
expect(data.moduleInfos[0].moduleName).assertEqual("com.example.staticabilitystagecontext"); expect(data.moduleInfos[0].moduleName).assertEqual("com.acts.stabilitystagecontext");
expect(data.codePath).assertEqual("/data/app/el1/bundle/public/" + expect(data.codePath).assertEqual("/data/app/el1/bundle/public/" +
"com.example.staticabilitystagecontext"); "com.acts.stabilitystagecontext");
expect(data.removable).assertEqual(true); expect(data.removable).assertEqual(true);
console.log("checkApplicationInfo end " + data); console.log("checkApplicationInfo end " + data);
} }
...@@ -145,7 +145,7 @@ export default function abilityTest() { ...@@ -145,7 +145,7 @@ export default function abilityTest() {
expect(typeof (data.moduleName)).assertEqual("string"); expect(typeof (data.moduleName)).assertEqual("string");
expect(typeof (data.mainAbilityName)).assertEqual("string"); expect(typeof (data.mainAbilityName)).assertEqual("string");
console.log("checkHapModuleInfo_expect_typeof_end") console.log("checkHapModuleInfo_expect_typeof_end")
expect(data.name).assertEqual("com.example.staticabilitystagecontext"); expect(data.name).assertEqual("com.acts.stabilitystagecontext");
expect(data.description).assertEqual("$string:phone_entry_dsc"); expect(data.description).assertEqual("$string:phone_entry_dsc");
expect(data.descriptionId).assertEqual(16777221); expect(data.descriptionId).assertEqual(16777221);
expect(data.icon).assertEqual("$media:icon"); expect(data.icon).assertEqual("$media:icon");
...@@ -157,10 +157,10 @@ export default function abilityTest() { ...@@ -157,10 +157,10 @@ export default function abilityTest() {
expect(data.reqCapabilities.length).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0);
expect(data.deviceTypes.length).assertEqual(2); expect(data.deviceTypes.length).assertEqual(2);
expect(data.deviceTypes[0]).assertEqual("default"); expect(data.deviceTypes[0]).assertEqual("default");
expect(data.moduleName).assertEqual("com.example.staticabilitystagecontext") expect(data.moduleName).assertEqual("com.acts.stabilitystagecontext")
expect(data.mainAbilityName).assertEqual("com.example.staticabilitystagecontext.MainAbility"); expect(data.mainAbilityName).assertEqual("com.acts.stabilitystagecontext.MainAbility");
expect(data.installationFree).assertEqual(false); expect(data.installationFree).assertEqual(false);
expect(data.mainElementName).assertEqual('com.example.staticabilitystagecontext.MainAbility'); expect(data.mainElementName).assertEqual('com.acts.stabilitystagecontext.MainAbility');
expect(data.hashValue).assertEqual(''); expect(data.hashValue).assertEqual('');
console.log("checkHapModuleInfo end " + data); console.log("checkHapModuleInfo end " + data);
} }
......
{ {
"module": { "module": {
"name": "com.example.staticabilitystagecontext", "name": "com.acts.stabilitystagecontext",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
"mainElement": "com.example.staticabilitystagecontext.MainAbility", "mainElement": "com.acts.stabilitystagecontext.MainAbility",
"deviceTypes": [ "deviceTypes": [
"default", "default",
"tablet" "tablet"
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.staticabilitystagecontext.MainAbility", "name": "com.acts.stabilitystagecontext.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.staticinformationmultihappackage", "bundleName": "com.acts.stinformationmulapp",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -44,7 +44,7 @@ export default class MainAbility extends Ability { ...@@ -44,7 +44,7 @@ export default class MainAbility extends Ability {
console.log("ACTS_getAbilityInfo_0400 MainAbility onForeground") console.log("ACTS_getAbilityInfo_0400 MainAbility onForeground")
if (globalThis.abilityWant.action == 'startHapA') { if (globalThis.abilityWant.action == 'startHapA') {
globalThis.abilityContext.startAbility({ globalThis.abilityContext.startAbility({
bundleName: "com.example.staticinformationmultihappackage", bundleName: "com.acts.stinformationmulapp",
abilityName: "com.example.feature.MainAbility", abilityName: "com.example.feature.MainAbility",
action: "startHapB" action: "startHapB"
}, (error, data) => { }, (error, data) => {
......
{ {
"module": { "module": {
"name": "com.example.staticinformationmultihappackage", "name": "com.acts.stinformationmulapp",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.staticinformationmultihappackage.MainAbility", "name": "com.acts.stinformationmulapp.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"app": { "app": {
"bundleName": "com.example.staticinformationmultihappackage", "bundleName": "com.acts.stinformationmulapp",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
{ {
"app":{ "app":{
"bundleName":"com.example.staticinfomationquery", "bundleName":"com.acts.staticinfomationquery",
"vendor":"huawei", "vendor":"huawei",
"versionCode":1000000, "versionCode":1000000,
"versionName":"1.0.0", "versionName":"1.0.0",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "300000", "test-timeout": "300000",
"bundle-name": "com.example.staticinfomationquery", "bundle-name": "com.acts.staticinfomationquery",
"module-name": "com.example.staticinfomationquery", "module-name": "com.acts.staticinfomationquery",
"shell-timeout": "600000", "shell-timeout": "600000",
"testcase-timeout": 70000 "testcase-timeout": 70000
}, },
......
...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner { ...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner {
onAbilityCreate: onAbilityCreateCallback, onAbilityCreate: onAbilityCreateCallback,
}; };
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a com.example.staticinfomationquery.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName var cmd = 'aa start -d 0 -a com.acts.staticinfomationquery.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"] var debug = abilityDelegatorArguments.parameters["-D"]
if (debug == 'true') if (debug == 'true')
......
...@@ -193,15 +193,15 @@ export default function abilityTest() { ...@@ -193,15 +193,15 @@ export default function abilityTest() {
expect(typeof (data.defaultFormWidth)).assertEqual("number"); expect(typeof (data.defaultFormWidth)).assertEqual("number");
expect(typeof (data.uri)).assertEqual("string"); expect(typeof (data.uri)).assertEqual("string");
expect(data.bundleName).assertEqual("com.example.staticinfomationquery"); expect(data.bundleName).assertEqual("com.acts.staticinfomationquery");
expect(data.name).assertEqual("com.example.staticinfomationquery.MainAbility"); expect(data.name).assertEqual("com.acts.staticinfomationquery.MainAbility");
expect(data.label).assertEqual("$string:entry_label"); expect(data.label).assertEqual("$string:entry_label");
expect(data.description).assertEqual("$string:phone_entry_main"); expect(data.description).assertEqual("$string:phone_entry_main");
expect(data.icon).assertEqual("$media:icon"); expect(data.icon).assertEqual("$media:icon");
expect(data.labelId).assertLarger(0); expect(data.labelId).assertLarger(0);
expect(data.descriptionId).assertLarger(0); expect(data.descriptionId).assertLarger(0);
expect(data.iconId).assertLarger(0); expect(data.iconId).assertLarger(0);
expect(data.moduleName).assertEqual("com.example.staticinfomationquery"); expect(data.moduleName).assertEqual("com.acts.staticinfomationquery");
expect(data.process).assertEqual(""); expect(data.process).assertEqual("");
expect(data.targetAbility).assertEqual(""); expect(data.targetAbility).assertEqual("");
expect(data.backgroundModes).assertEqual(0); expect(data.backgroundModes).assertEqual(0);
...@@ -275,7 +275,7 @@ export default function abilityTest() { ...@@ -275,7 +275,7 @@ export default function abilityTest() {
expect(typeof (data.codePath)).assertEqual("string"); expect(typeof (data.codePath)).assertEqual("string");
expect(typeof (data.removable)).assertEqual("boolean"); expect(typeof (data.removable)).assertEqual("boolean");
console.log("checkApplicationInfo_expect_typeof_end") console.log("checkApplicationInfo_expect_typeof_end")
expect(data.name).assertEqual("com.example.staticinfomationquery"); expect(data.name).assertEqual("com.acts.staticinfomationquery");
expect(data.description).assertEqual("$string:description_application"); expect(data.description).assertEqual("$string:description_application");
expect(data.descriptionId).assertLarger(0); expect(data.descriptionId).assertLarger(0);
expect(data.systemApp).assertEqual(true); expect(data.systemApp).assertEqual(true);
...@@ -284,11 +284,11 @@ export default function abilityTest() { ...@@ -284,11 +284,11 @@ export default function abilityTest() {
expect(data.labelId.length).assertLarger(0); expect(data.labelId.length).assertLarger(0);
expect(data.icon).assertEqual("$media:icon"); expect(data.icon).assertEqual("$media:icon");
expect(data.iconId.length).assertLarger(0); expect(data.iconId.length).assertLarger(0);
expect(data.process).assertEqual("com.example.staticinfomationquery"); expect(data.process).assertEqual("com.acts.staticinfomationquery");
expect(data.supportedModes).assertEqual(0); expect(data.supportedModes).assertEqual(0);
expect(data.moduleInfos.length).assertEqual(1); expect(data.moduleInfos.length).assertEqual(1);
expect(data.moduleInfos[0].moduleName).assertEqual("com.example.staticinfomationquery"); expect(data.moduleInfos[0].moduleName).assertEqual("com.acts.staticinfomationquery");
expect(data.codePath).assertEqual("/data/app/el1/bundle/public/com.example.staticinfomationquery") expect(data.codePath).assertEqual("/data/app/el1/bundle/public/com.acts.staticinfomationquery")
expect(data.removable).assertEqual(true); expect(data.removable).assertEqual(true);
console.log("checkApplicationInfo end " + data); console.log("checkApplicationInfo end " + data);
} }
...@@ -329,7 +329,7 @@ export default function abilityTest() { ...@@ -329,7 +329,7 @@ export default function abilityTest() {
expect(typeof (data.moduleName)).assertEqual("string"); expect(typeof (data.moduleName)).assertEqual("string");
expect(typeof (data.mainAbilityName)).assertEqual("string"); expect(typeof (data.mainAbilityName)).assertEqual("string");
console.log("checkHapModuleInfo_expect_typeof_end") console.log("checkHapModuleInfo_expect_typeof_end")
expect(data.name).assertEqual("com.example.staticinfomationquery"); expect(data.name).assertEqual("com.acts.staticinfomationquery");
expect(data.description).assertEqual("$string:phone_entry_dsc"); expect(data.description).assertEqual("$string:phone_entry_dsc");
expect(data.descriptionId).assertEqual(16777221); expect(data.descriptionId).assertEqual(16777221);
expect(data.icon).assertEqual("$media:icon"); expect(data.icon).assertEqual("$media:icon");
...@@ -341,10 +341,10 @@ export default function abilityTest() { ...@@ -341,10 +341,10 @@ export default function abilityTest() {
expect(data.reqCapabilities.length).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0);
expect(data.deviceTypes.length).assertEqual(2); expect(data.deviceTypes.length).assertEqual(2);
expect(data.deviceTypes[0]).assertEqual("default"); expect(data.deviceTypes[0]).assertEqual("default");
expect(data.moduleName).assertEqual("com.example.staticinfomationquery") expect(data.moduleName).assertEqual("com.acts.staticinfomationquery")
expect(data.mainAbilityName).assertEqual("com.example.staticinfomationquery.MainAbility"); expect(data.mainAbilityName).assertEqual("com.acts.staticinfomationquery.MainAbility");
expect(data.installationFree).assertEqual(false); expect(data.installationFree).assertEqual(false);
expect(data.mainElementName).assertEqual('com.example.staticinfomationquery.MainAbility'); expect(data.mainElementName).assertEqual('com.acts.staticinfomationquery.MainAbility');
expect(data.hashValue).assertEqual(''); expect(data.hashValue).assertEqual('');
console.log("checkHapModuleInfo end " + data); console.log("checkHapModuleInfo end " + data);
} }
......
{ {
"module": { "module": {
"name": "com.example.staticinfomationquery", "name": "com.acts.staticinfomationquery",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
"mainElement": "com.example.staticinfomationquery.MainAbility", "mainElement": "com.acts.staticinfomationquery.MainAbility",
"deviceTypes": [ "deviceTypes": [
"default", "default",
"tablet" "tablet"
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.staticinfomationquery.MainAbility", "name": "com.acts.staticinfomationquery.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
...@@ -76,9 +76,9 @@ export default function abilityTest() { ...@@ -76,9 +76,9 @@ export default function abilityTest() {
console.log("ACTS_getAbilityInfo_0500_feature_abilityInfo" + abilityInfo1.name) console.log("ACTS_getAbilityInfo_0500_feature_abilityInfo" + abilityInfo1.name)
console.log("ACTS_getAbilityInfo_0500_feature_applicationInfo" + applicationInfo1.name) console.log("ACTS_getAbilityInfo_0500_feature_applicationInfo" + applicationInfo1.name)
console.log("ACTS_getAbilityInfo_0500_feature_hapModuleInfo" + hapModuleInfo1.name) console.log("ACTS_getAbilityInfo_0500_feature_hapModuleInfo" + hapModuleInfo1.name)
expect(abilityInfo1.name).assertEqual("com.example.staticinformationmultihappackage.MainAbility"); expect(abilityInfo1.name).assertEqual("com.acts.stinformationmulapp.MainAbility");
expect(applicationInfo1.name).assertEqual("com.example.staticinformationmultihappackage"); expect(applicationInfo1.name).assertEqual("com.acts.stinformationmulapp");
expect(hapModuleInfo1.name).assertEqual("com.example.staticinformationmultihappackage"); expect(hapModuleInfo1.name).assertEqual("com.acts.stinformationmulapp");
} }
if(EntryHap && FeatureHap){ if(EntryHap && FeatureHap){
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
......
...@@ -36,8 +36,8 @@ export default function abilityTest() { ...@@ -36,8 +36,8 @@ export default function abilityTest() {
var FeatureHap = false; var FeatureHap = false;
globalThis.abilityContext.startAbility({ globalThis.abilityContext.startAbility({
bundleName: "com.example.staticinformationmultihappackage", bundleName: "com.acts.stinformationmulapp",
abilityName: "com.example.staticinformationmultihappackage.MainAbility", abilityName: "com.acts.stinformationmulapp.MainAbility",
action:"startHapA" action:"startHapA"
}, (error, data) => { }, (error, data) => {
console.log('ACTS_getAbilityInfo_0400 - startAbility start HapA: ' console.log('ACTS_getAbilityInfo_0400 - startAbility start HapA: '
...@@ -64,9 +64,9 @@ export default function abilityTest() { ...@@ -64,9 +64,9 @@ export default function abilityTest() {
console.log("ACTS_getAbilityInfo_0400_entry_abilityInfo" + abilityInfo.name) console.log("ACTS_getAbilityInfo_0400_entry_abilityInfo" + abilityInfo.name)
console.log("ACTS_getAbilityInfo_0400_entry_applicationInfo" + applicationInfo.name) console.log("ACTS_getAbilityInfo_0400_entry_applicationInfo" + applicationInfo.name)
console.log("ACTS_getAbilityInfo_0400_entry_hapModuleInfo" + hapModuleInfo.name) console.log("ACTS_getAbilityInfo_0400_entry_hapModuleInfo" + hapModuleInfo.name)
expect(abilityInfo.name).assertEqual("com.example.staticinformationmultihappackage.MainAbility"); expect(abilityInfo.name).assertEqual("com.acts.stinformationmulapp.MainAbility");
expect(applicationInfo.name).assertEqual("com.example.staticinformationmultihappackage"); expect(applicationInfo.name).assertEqual("com.acts.stinformationmulapp");
expect(hapModuleInfo.name).assertEqual("com.example.staticinformationmultihappackage"); expect(hapModuleInfo.name).assertEqual("com.acts.stinformationmulapp");
} else if (data.event == 'MainAbility_Start_CommonEvent_multi_hap_feature'){ } else if (data.event == 'MainAbility_Start_CommonEvent_multi_hap_feature'){
FeatureHap = true; FeatureHap = true;
console.log("ACTS_getAbilityInfo_0400====> MainAbility_Start_CommonEvent_multi_hap_feature") console.log("ACTS_getAbilityInfo_0400====> MainAbility_Start_CommonEvent_multi_hap_feature")
...@@ -77,7 +77,7 @@ export default function abilityTest() { ...@@ -77,7 +77,7 @@ export default function abilityTest() {
console.log("ACTS_getAbilityInfo_0400_feature_applicationInfo" + applicationInfo1.name) console.log("ACTS_getAbilityInfo_0400_feature_applicationInfo" + applicationInfo1.name)
console.log("ACTS_getAbilityInfo_0400_feature_hapModuleInfo" + hapModuleInfo1.name) console.log("ACTS_getAbilityInfo_0400_feature_hapModuleInfo" + hapModuleInfo1.name)
expect(abilityInfo1.name).assertEqual("com.example.feature.MainAbility"); expect(abilityInfo1.name).assertEqual("com.example.feature.MainAbility");
expect(applicationInfo1.name).assertEqual("com.example.staticinformationmultihappackage"); expect(applicationInfo1.name).assertEqual("com.acts.stinformationmulapp");
expect(hapModuleInfo1.name).assertEqual("com.example.feature"); expect(hapModuleInfo1.name).assertEqual("com.example.feature");
} }
if(EntryHap && FeatureHap){ if(EntryHap && FeatureHap){
......
...@@ -67,8 +67,8 @@ export default class MainAbility extends Ability { ...@@ -67,8 +67,8 @@ export default class MainAbility extends Ability {
if (globalThis.abilityWant.action == 'startmultiple') { if (globalThis.abilityWant.action == 'startmultiple') {
globalThis.abilityContext.startAbility({ globalThis.abilityContext.startAbility({
bundleName: "com.example.staticinformationmultihappackage", bundleName: "com.acts.stinformationmulapp",
abilityName: "com.example.staticinformationmultihappackage.MainAbility", abilityName: "com.acts.stinformationmulapp.MainAbility",
action: "multiple" action: "multiple"
}, (err, data) => { }, (err, data) => {
console.log('ACTS_getAbilityInfo_0500 MainAbility onForeground - startAbility restart singleton: ' console.log('ACTS_getAbilityInfo_0500 MainAbility onForeground - startAbility restart singleton: '
......
{ {
"app": { "app": {
"bundleName": "com.example.actsabilitypermissiontest", "bundleName": "com.acts.abilitypermissiontest",
"vendor": "huawei", "vendor": "huawei",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "1.0.0", "versionName": "1.0.0",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "300000", "test-timeout": "300000",
"bundle-name": "com.example.actsabilitypermissiontest", "bundle-name": "com.acts.abilitypermissiontest",
"module-name": "com.example.actsabilitypermissiontest", "module-name": "com.acts.abilitypermissiontest",
"shell-timeout": "600000", "shell-timeout": "600000",
"testcase-timeout": 70000 "testcase-timeout": 70000
}, },
......
...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner { ...@@ -59,7 +59,7 @@ export default class OpenHarmonyTestRunner implements TestRunner {
onAbilityCreate: onAbilityCreateCallback, onAbilityCreate: onAbilityCreateCallback,
}; };
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a com.example.actsabilitypermissiontest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName var cmd = 'aa start -d 0 -a com.acts.abilitypermissiontest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"] var debug = abilityDelegatorArguments.parameters["-D"]
if (debug == 'true') if (debug == 'true')
......
...@@ -71,8 +71,8 @@ export default function abilityPermissionTest() { ...@@ -71,8 +71,8 @@ export default function abilityPermissionTest() {
console.debug("====>start startAbility_100====>"); console.debug("====>start startAbility_100====>");
await globalThis.abilityContext.startAbilityWithAccount( await globalThis.abilityContext.startAbilityWithAccount(
{ {
bundleName: 'com.example.actsabilitypermissiontest', bundleName: 'com.acts.abilitypermissiontest',
abilityName: 'com.example.actsabilitypermissiontest.MainAbility2' abilityName: 'com.acts.abilitypermissiontest.MainAbility2'
}, userA, () => { }, userA, () => {
console.debug("====>startAbility end_100====>"); console.debug("====>startAbility end_100====>");
}) })
...@@ -117,8 +117,8 @@ export default function abilityPermissionTest() { ...@@ -117,8 +117,8 @@ export default function abilityPermissionTest() {
console.debug("====>start startAbility_0300====>"); console.debug("====>start startAbility_0300====>");
await globalThis.abilityContext.startAbilityWithAccount( await globalThis.abilityContext.startAbilityWithAccount(
{ {
bundleName: 'com.example.actssystemappuonehundredonerelytest', bundleName: 'com.acts.systemapponerely',
abilityName: 'com.example.actssystemappuonehundredonerelytest.MainAbility' abilityName: 'com.acts.systemapponerely.MainAbility'
}, userA ).then().catch((err) => { }, userA ).then().catch((err) => {
console.debug("ACTS_AbilityPermission_0300====>" + err) console.debug("ACTS_AbilityPermission_0300====>" + err)
...@@ -176,8 +176,8 @@ export default function abilityPermissionTest() { ...@@ -176,8 +176,8 @@ export default function abilityPermissionTest() {
console.debug("====>0600start connectAbility====>"); console.debug("====>0600start connectAbility====>");
connId = await globalThis.abilityContext.connectAbilityWithAccount( connId = await globalThis.abilityContext.connectAbilityWithAccount(
{ {
bundleName: 'com.example.actssystemappuonehundredonerelytest', bundleName: 'com.acts.systemapponerely',
abilityName: 'com.example.actssystemappuonehundredonerelytest.ServiceAbility', abilityName: 'com.acts.systemapponerely.ServiceAbility',
action: "StartAbilityPromise" action: "StartAbilityPromise"
}, userA, { }, userA, {
onConnect: onConnectCallbackC, onConnect: onConnectCallbackC,
......
{ {
"module": { "module": {
"name": "com.example.actsabilitypermissiontest", "name": "com.acts.abilitypermissiontest",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.actsabilitypermissiontest.MainAbility", "name": "com.acts.abilitypermissiontest.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
] ]
}, },
{ {
"name": "com.example.actsabilitypermissiontest.MainAbility2", "name": "com.acts.abilitypermissiontest.MainAbility2",
"srcEntrance": "./ets/MainAbility2/MainAbility2.ts", "srcEntrance": "./ets/MainAbility2/MainAbility2.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
{ {
"module": { "module": {
"name": "com.example.actssystemappuonehundredonerelytest", "name": "com.acts.systemapponerely",
"type": "entry", "type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts", "srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc", "description": "$string:phone_entry_dsc",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
], ],
"abilities": [ "abilities": [
{ {
"name": "com.example.actssystemappuonehundredonerelytest.MainAbility", "name": "com.acts.systemapponerely.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts", "srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main", "description": "$string:phone_entry_main",
"icon": "$media:icon", "icon": "$media:icon",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册