diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility/data.ts b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility/data.ts index 1a20eee46467aae73e076eb589ac0d4f36a1e61f..622c50ba44e2bf3fee88052461df2f40cb618619 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility/data.ts +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility/data.ts @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import dataAbility from '@ohos.data.dataAbility' import featureAbility from '@ohos.ability.featureAbility' +import dataAbility from '@ohos.data.dataAbility' import fileio from '@ohos.fileio' import dataRdb from '@ohos.data.rdb' @@ -251,4 +251,4 @@ export default { } callback("success", uri); } -}; \ No newline at end of file +}; diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility2/data.ts b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility2/data.ts index f84642cbb8dcc82295cb720eaf2affb061edee4a..4906d9e3927e85556786e154b69b3d6a46148db0 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility2/data.ts +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility2/data.ts @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import dataAbility from '@ohos.data.dataAbility' import featureAbility from '@ohos.ability.featureAbility' +import dataAbility from '@ohos.data.dataAbility' import fileio from '@ohos.fileio' import dataRdb from '@ohos.data.rdb' @@ -251,4 +251,4 @@ export default { } callback("success", uri); } -}; \ No newline at end of file +}; diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility3/data.ts b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility3/data.ts index 554b740667263fdb16eda8f4476f1d7f0a834b58..e6a8ac729d8c71ef8e16472a363c767472ffd27d 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility3/data.ts +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/TestDataAbility3/data.ts @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import dataAbility from '@ohos.data.dataAbility' import featureAbility from '@ohos.ability.featureAbility' +import dataAbility from '@ohos.data.dataAbility' import fileio from '@ohos.fileio' import dataRdb from '@ohos.data.rdb' @@ -213,4 +213,4 @@ export default { } callback("success", uri); } -}; \ No newline at end of file +}; diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 950088fc292fc6cd326ff6121b47cf943ebbb19c..9962ff55df8eeb24c19a5ff74a6f330b99f6bc6d 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -16,6 +16,15 @@ import Ability from '@ohos.application.Ability' import commonEvent from '@ohos.commonEvent' +function sleep(delay) { + let start = new Date().getTime(); + while (true) { + if (new Date().getTime() - start > delay) { + break; + } + } +} + export default class MainAbility extends Ability { onCreate(want, launchParam) { // Ability is creating, initialize resources for this ability @@ -48,6 +57,7 @@ export default class MainAbility extends Ability { } onForeground() { + sleep(1000) // Ability has brought to foreground console.log("ACTS_NewWant MainAbility onForeground") if (globalThis.abilityWant.action == 'startHapC') { diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 70dd29e22def32f76e65823d8a300886ce0899a8..8e74ecba1184139d319dcacccca2bf5f5f1bd501 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -16,6 +16,15 @@ import Ability from '@ohos.application.Ability' import commonEvent from '@ohos.commonEvent' +function sleep(delay) { + let start = new Date().getTime(); + while (true) { + if (new Date().getTime() - start > delay) { + break; + } + } +} + export default class MainAbility extends Ability { onCreate(want, launchParam) { // Ability is creating, initialize resources for this ability @@ -48,6 +57,7 @@ export default class MainAbility extends Ability { } onForeground() { + sleep(1000) // Ability has brought to foreground console.log("ACTS_NewWant MainAbility onForeground") if (globalThis.abilityWant.action == 'startHapB') { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 8dbd22aa90fc244b2217842c1deaafb29e75d487..153190f2bd79b7052d7119b2c30b8786211f088e 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -16,6 +16,15 @@ import Ability from '@ohos.application.Ability' import commonEvent from '@ohos.commonEvent' +function sleep(delay) { + let start = new Date().getTime(); + while (true) { + if (new Date().getTime() - start > delay) { + break; + } + } +} + export default class MainAbility extends Ability { onCreate(want, launchParam) { // Ability is creating, initialize resources for this ability @@ -48,6 +57,7 @@ export default class MainAbility extends Ability { } onForeground() { + sleep(1000) // Ability has brought to foreground console.log("ACTS_NewWant MainAbility onForeground") if (globalThis.abilityWant.action == 'startStandard0400') { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts index 9f0688daa9e0d7534fac867c7279eae255ba0a59..3faed4fc184b3e4259d26d18a1e86bb7ae43ac95 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts @@ -16,6 +16,15 @@ import Ability from '@ohos.application.Ability' import commonEvent from '@ohos.commonEvent' +function sleep(delay) { + let start = new Date().getTime(); + while (true) { + if (new Date().getTime() - start > delay) { + break; + } + } +} + export default class SecondAbility extends Ability { onCreate(want, launchParam) { @@ -48,6 +57,7 @@ export default class SecondAbility extends Ability { } onForeground() { + sleep(1000) // Ability has brought to foreground var connId; console.log("ACTS_NewWant SecondAbility onForeground")