From 5941da9aac275d4d99fe7baa924b827130818f2c Mon Sep 17 00:00:00 2001
From: qigongming <qigongming@huawei.com>
Date: Mon, 21 Mar 2022 11:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E4=BE=8B=E5=92=8C=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: qigongming <qigongming@huawei.com>
Change-Id: Ia1b55f1ac462454289ff480f8fddc689e576bd25
---
 .../deviceusagestatisticsjsunit/BUILD.gn      |   2 +-
 ...x.p7b => ohos_device_usage_statistics.p7b} | Bin 3437 -> 3451 bytes
 .../src/main/config.json                      |  10 +++++++
 .../test/DeviceUsageStatisticsJsunit.test.js  |  26 +++++++++---------
 4 files changed, 24 insertions(+), 14 deletions(-)
 rename resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/signature/{openharmony_sx.p7b => ohos_device_usage_statistics.p7b} (52%)

diff --git a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/BUILD.gn b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/BUILD.gn
index 57d154dd4..95d4513fc 100644
--- a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/BUILD.gn
+++ b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("resourceschedule_deviceusagestatisticsjsunit_js_test") {
     ":resourceschedule_js_assets",
     ":resourceschedule_js_resources",
   ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
+  certificate_profile = "./signature/ohos_device_usage_statistics.p7b"
   hap_name = "ActsResourcescheduleDeviceUsageStatisticsJsunitTest"
 }
 ohos_js_assets("resourceschedule_js_assets") {
diff --git a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/signature/openharmony_sx.p7b b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/signature/ohos_device_usage_statistics.p7b
similarity index 52%
rename from resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/signature/openharmony_sx.p7b
rename to resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/signature/ohos_device_usage_statistics.p7b
index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..6d38035da96bab2ca3e7cdb4cc9d76c1d8cdd32f 100644
GIT binary patch
delta 988
zcmZ9LPl)4W7{+O*GdnXoqo5+pf-n|YaGjZc$uv93xT4>eq)EC>(@fJpDU~(<nzT*R
zv`L#xR~hVKP=r~Bx);ZVRZvhE5cRP4J*x*V;z7K45xgmT@M2|Q6fZA4KYl!?_xb(G
zUssO6bUj*HxpvGSKUz;*O5UHYJ9A_v6A5e`TwYpv<Csra3#nuROcyu)6%+TTi>s;W
z;?nK(*ct}yzPD}kO)I^RZCwCQ>&-zL+W|Wuy_Ft~+U7hG0N>Lo%GxGc^K<&e#*^Wp
z|BpAcTuTeA^l9g%(}x?+6I7PGPT&N&mG=7Kw$=)*;k^DjNoDtT=lHGJ6N$~sl5csu
zHthAi!`aJ;SDzIpG!1pjhLM1vEwGwIXC}<-{lsTSVh0{JJy8*2NfG0kV-$-_Hx@f$
ze8D=XFUmng%PLcqWsZ&VjM8B%A`&==Ran{)3r$biMXug;9HWPgb*~$93alf$SVb^U
zSeA+!H9}D9`B29RLdYGsY7N9U8F<utEQw0f<H7$lHWwLO?5lVVXf<ji<npf0RUHGb
zL^TB}$TkK}w<DEg0U_HSG`+`3L?|lK5GuMV(X#B<h?dz^`C^tBgZeJywHU)YC1kQp
zKgi||ga&5Sd$FWW%3RaSM`A1Bol1oQEa?hBsjCgI*t10}=#NLbB@du7^B103wUMGb
zL!;gFW+w~eQLYrm!;#}QJ>vk$LEemv#-K2w`o&7s)<hU_G(F(TVwOTsWRMIQ4Z^4)
z3o*=x8Ys!QpJjwm#t)iaK{N|AW6MN^$6SE2CC)*vXq#<((jvVs75LhOm4ytb7bCwF
zk}?$Nh%b*IUbEb4JJWA^6X@mu$#{BxC`qB@$pa$drIO32C@Y1PiKOP|Jw`tqvR*#U
zPq@Iz%-%`uUo)+7+psEuW?SV@3)?~1HiG$|YQ8)F#^5jrt==tN3);rl-=`Xv7GDF?
z#Esd`+F<R!vzVQ)?Hu6%$4G!@34&~Z%*9GpQdl~*c`sGEb5(*5ifC{Dj~Ds!)!T2f
z<*y#y(9Rg@hi{W7V0CGEzQ6BYNi8H(Ilv@0pF964{HXQe_%8bLgOi4N-2D;D{IWcF
y*ME3^^Y!JQUr27+%AN9WXLqyW)2knAXHRXtckgrVR_#yzSM0&t-+c0Esqi;ATSAin

delta 988
zcmY+DO^D-U7{@oA%&a4=g2I4%nXw)O=PT*gqyy{t=3|m{CTY_){RllwlBP|YG->nE
zG;yWS!yqWa(2MLr*Tae@UC@iLAnQ#Kg=JB1Dkyr<1wHIR1Un-;;_?0cpWnlKc>aG~
z`|a8knI(EFt1q20r;ifQ)!40BLRz3&41&<7k;KaC$teSAOK=QYzJkn_SN<D?Zq49F
z@C^R*)#O-n+@5W1Tk=3l?kCY5WCuxZU1HU4FEF~5l!wFZcF*;kp5lAwf)}3MT|4XV
zoZWvel}n}fQkgvz+e%utw=H)(%~@EvY&Mlc7WlQTq!$j)_dA-Y$*z{1$Dxgct=n!}
z8*8RL)SUSqbg)(=2?8joE(lm0bXlreE=giEe-nCt%J(U>WpN}M@l`Qh*Hxa2s9-^(
zOV-DIPH+Q4Xp%KSpsAohR{K<i!vPIYks@%e(6Xd-O;-kOLrG;Vu1p1Fa52qLfgZ_p
z&DRFHsq`s<1DSs<ontCud3xBU7h;tX7N2+=O)jFxiOAvXg#sqrv69A3WuWWo039oq
z5!9=oig(qKZuE;St0b^E-tAtzN&<)D0Z#x>21k+RS5b-*sBtc!^;E}K0wxOc4PWvC
zqv|)<KGQ(-?4)IByw+7zfxz3M({7UJq)9X+0*@%iXdYRZEwHS`xBb*{7#-Ru8;B(6
z;9b7PR5*$zLA_;l@v5RbYHvPU!lo_jkcje=4ihyHGi(?PUq-cJM(WtRo63*_0ZkAi
zy254hIN(TJ0HhRvKmu$~MK_NP9AjJ7K%aC1E6imkwX|o3z9_o-kz96+i3~7tmo|ON
z8N0)LJ=98-5*v;OGB>dc70|~C#B+GMW%)%0@EP0eA@z#f9N{H~>F$bpM<uaMqpXr4
zFPcYQv1U1G#yE}|SRvoex{jKU-0Slj@P1+tE-uyVsq*=ee*6P0U0o)S8FVl|h>xE7
ze<$X5<2zFn$)Q;!mB!MTgzR2cWEDn}@J8@pP5l79*L)cJ<o4#t{(9r)4e`ehA1HsE
zeg4t6*z0c~Pp&+%sNYxD;iVW%BUEg|DUvV5*MI-QOAp4cyzB79_-pC!!aK^S@cqNL
v;xE1&d;ZF&88!H3iTmzmGV#p%vv=&De|hiZ-bv~9+jqWnKl}B5<EMWBVVg@2

diff --git a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/config.json b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/config.json
index cfc62d420..c90a14a17 100644
--- a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/config.json
+++ b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/config.json
@@ -55,6 +55,16 @@
           "autoDesignWidth": false
         }
       }
+    ],
+	"defPermissions": [
+        {
+          "name": "ohos.permission.BUNDLE_ACTIVE_INFO"
+        }
+      ],
+      "reqPermissions": [
+        {
+          "name": "ohos.permission.BUNDLE_ACTIVE_INFO"
+        }
     ]
   }
 }
diff --git a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/js/default/test/DeviceUsageStatisticsJsunit.test.js b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/js/default/test/DeviceUsageStatisticsJsunit.test.js
index baf38e265..5071c1642 100644
--- a/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/js/default/test/DeviceUsageStatisticsJsunit.test.js
+++ b/resourceschedule/resourceschedule_standard/deviceusagestatisticsjsunit/src/main/js/default/test/DeviceUsageStatisticsJsunit.test.js
@@ -342,7 +342,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
      */
     it("DeviceUsageStatisticsJsTest013", 0, function (done) {
         console.info('----------------------DeviceUsageStatisticsJsTest013---------------------------');
-        let value1 = bundleState.intervalType.BY_OPTIMIZED;
+        let value1 = bundleState.IntervalType.BY_OPTIMIZED;
         expect(value1).assertEqual(0)
         done();
     })
@@ -355,7 +355,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
      */
     it("DeviceUsageStatisticsJsTest014", 0, function (done) {
         console.info('----------------------DeviceUsageStatisticsJsTest014---------------------------');
-        let value1 = bundleState.intervalType.BY_DAILY;
+        let value1 = bundleState.IntervalType.BY_DAILY;
         expect(value1).assertEqual(1)
         done();
     })
@@ -368,7 +368,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
      */
     it("DeviceUsageStatisticsJsTest015", 0, function (done) {
         console.info('----------------------DeviceUsageStatisticsJsTest015---------------------------');
-        let value1 = bundleState.intervalType.BY_WEEKLY;
+        let value1 = bundleState.IntervalType.BY_WEEKLY;
         expect(value1).assertEqual(2)
         done();
     })
@@ -381,7 +381,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
      */
     it("DeviceUsageStatisticsJsTest016", 0, function (done) {
         console.info('----------------------DeviceUsageStatisticsJsTest016---------------------------');
-        let value1 = bundleState.intervalType.BY_MONTHLY;
+        let value1 = bundleState.IntervalType.BY_MONTHLY;
         expect(value1).assertEqual(3)
         done();
     })
@@ -394,7 +394,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
      */
     it("DeviceUsageStatisticsJsTest017", 0, function (done) {
         console.info('----------------------DeviceUsageStatisticsJsTest017---------------------------');
-        let value1 = bundleState.intervalType.BY_ANNUALLY;
+        let value1 = bundleState.IntervalType.BY_ANNUALLY;
         expect(value1).assertEqual(4)
         done();
     })
@@ -689,7 +689,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest028---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -716,7 +716,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest029---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -743,7 +743,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest030---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -770,7 +770,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest031---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -797,7 +797,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest032---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -824,7 +824,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest033---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => {
+        bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
@@ -851,7 +851,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest034---------------------------');
         let beginTime = 10;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(beginTime, endTime).then((res) => {
+        bundleState.queryBundleStateInfos(beginTime, endTime).then((res) => {
             expect(true).assertEqual(true);
 			let bundleStateInfo1 = {
 				bundleName: 'www.explace.com',
@@ -890,7 +890,7 @@ describe("DeviceUsageStatisticsJsTest", function () {
         console.info('----------------------DeviceUsageStatisticsJsTest035---------------------------');
         let beginTime = 1001;
         let endTime = 20000000000000;
-        bundleState.queryCurrentBundleActiveStates(0, beginTime, endTime, (err, res) => {
+        bundleState.queryBundleStateInfoByInterval(0, beginTime, endTime, (err, res) => {
             if(err.code === 0) {
                 expect(true).assertEqual(true);
 				if(res === undefined) {
-- 
GitLab