!2753 【XTS】【事件通知子系统】规范性修改

Merge pull request !2753 from zhijianwen/OpenHarmony-3.1-Release

notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js

@@ -228,9 +228,9 @@ describe('ActsAnsActionButtonTest', function () {
         WantAgent.trigger(wantAgentD, triggerInfoD,
             (err, data) => {
                 if (err.code == 0) {
-                    console.info('==== triggerD success' + err.code+JSON.stringify(data) );
+                    console.info('==== triggered success' + err.code+JSON.stringify(data) );
                 } else {
-                    console.info('----triggerD failed!----'+err.code);
+                    console.info('----triggered failed!----'+err.code);
                 }
             });
     }

notification/ans_standard/publish_test/actsansgetallactive/entry/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 .container {
     flex-direction: column;
     justify-content: center;

notification/ans_standard/publish_test/actsansgetallactive/entry/src/main/js/default/pages/index/index.hml

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 <div class="container">
     <text class="title">
         currentApp

notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        通知许可设定测试
+        Test Enabling of Notifiction
     </text>
 </div>

notification/ans_standard/publish_test/publish/entry/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 .container {
     flex-direction: column;
     justify-content: center;

notification/ans_standard/publish_test/publish/entry/src/main/js/default/pages/index/index.hml

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 <div class="container">
     <text class="title">
-        发布Icon通知
+        Publishing ICON Notifiction
     </text>
 </div>

notification/ans_standard/publish_test/sub/entry/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 .container {
     flex-direction: column;
     justify-content: center;

notification/ans_standard/publish_test/sub/entry/src/main/js/default/pages/index/index.hml

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 <div class="container">
     <text class="title">
-        订阅发布
+        Text of Publishing Common Event
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgent1
+        WantAgent1 Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgent1Promise
+        WantAgent1Promise Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgent3
+        WantAgent3 Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgentPromise3
+        WantAgentPromise3 Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgent4
+        WantAgent4 Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgentPromise4
-    </text>
+        WantAgentPromise4 Startup
+    </text> 
 </div>

notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
 
 <div class="container">
     <text class="title">
-        WantAgent5
+        WantAgent5 Startup
     </text>
 </div>

notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/default/pages/index/index.hml

@@ -15,6 +15,6 @@
  
 <div class="container">
     <text class="title">
-        WantAgentPromise5
+        WantAgentPromise5 Startup
     </text>
 </div>

notification/ces_standard/subscribeandpublish/actspublish/entry/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 .container {
     flex-direction: column;
     justify-content: center;

notification/ces_standard/subscribeandpublish/actspublish/entry/src/main/js/default/pages/index/index.hml

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 <div class="container">
     <text class="title">
-        您好，地球1111
+        Hello, World!
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/pages/index/index.hml

@@ -15,7 +15,7 @@
  
 <div class="container">
     <text class="title">
-        Hello,Earth!  1111
+        Hello, World!  
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js

@@ -17,18 +17,18 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 
 describe('ActsSubscriberTestOrder', function () {
     console.info("===========ActsSubscriberTestOrder start====================>");
-    var num2 = 0;
-    var order = false;
-    var commonEventSubscriber0100;
-    var commonEventSubscriber0101;
-    var commonEventSubscriber0200;
-    var commonEventSubscriber0201;
-    var commonEventSubscriber0300;
-    var commonEventSubscriber0301;
-    var commonEventSubscriber0400;
-    var commonEventSubscriber0401;
-    var commonEventSubscriber0500;
-    var commonEventSubscriber0501;
+    let num2 = 0;
+    let order = false;
+    let commonEventSubscriber0100;
+    let commonEventSubscriber0101;
+    let commonEventSubscriber0200;
+    let commonEventSubscriber0201;
+    let commonEventSubscriber0300;
+    let commonEventSubscriber0301;
+    let commonEventSubscriber0400;
+    let commonEventSubscriber0401;
+    let commonEventSubscriber0500;
+    let commonEventSubscriber0501;
 
     function publishCallback(err) {
         console.info("===============>publishCallback");
@@ -46,17 +46,17 @@ describe('ActsSubscriberTestOrder', function () {
     it('ActsSubscriberTestOrder_0100', 0, async function (done) {
         console.info("===============ActsSubscriberTestOrder_0100===============>");
 
-        var commonEventSubscribeInfo1 = {
+        let commonEventSubscribeInfo1 = {
             events: ["publish_event0100"],
             priority: 10
         };
 
-        var commonEventSubscribeInfo2 = {
+        let commonEventSubscribeInfo2 = {
             events: ["publish_event0100"],
             priority: 9
         };
 
-        var commonEventPublishData = {
+        let commonEventPublishData = {
             bundleName: "publish_event0100_bundleName",
             code: 1,
             data: "publish_event1001_init",
@@ -163,25 +163,25 @@ describe('ActsSubscriberTestOrder', function () {
     it ('ActsSubscriberTestOrder_0200', 0, async function (done) {
         console.info("===============ActsSubscriberTestOrder_0200===============>");
 
-        var commonEventSubscribeInfo1 = {
+        let commonEventSubscribeInfo1 = {
             events: ["publish_event0200",
                 "publish_event0201"],
             priority: 10
         };
 
-        var commonEventSubscribeInfo2 = {
+        let commonEventSubscribeInfo2 = {
             events: ["publish_event0201"],
             priority: 9
         };
 
-        var commonEventPublishData1 = {
+        let commonEventPublishData1 = {
             bundleName: "publish_event0200_bundleName",
             code: 1,
             data: "publish_event0200_init",
             isOrdered: false,
         }
 
-        var commonEventPublishData2 = {
+        let commonEventPublishData2 = {
             bundleName: "publish_event0201_bundleName",
             code: 1,
             data: "publish_event0201_init",
@@ -275,24 +275,24 @@ describe('ActsSubscriberTestOrder', function () {
     it ('ActsSubscriberTestOrder_0300', 0, async function (done) {
         console.info("===============ActsSubscriberTestOrder_0300===============>");
 
-        var commonEventSubscribeInfo1 = {
+        let commonEventSubscribeInfo1 = {
             events: ["publish_event0301"],
             priority: 9
         };
 
-        var commonEventSubscribeInfo2 = {
+        let commonEventSubscribeInfo2 = {
             events: ["publish_event0301"],
             priority: 10
         };
 
-        var commonEventPublishData2 = {
+        let commonEventPublishData2 = {
             bundleName: "publish_event0301_bundleName",
             code: 1,
             data: "publish_event0301_init",
             isOrdered: true,
         }
 
-        var callBackNum = 0;
+        let callBackNum = 0;
         async function subscriberCallBack0300(err, data) {
             console.info("===============>subscriberCallBack0300========event: " + data.event);
             console.info("===============>subscriberCallBack0300========bundleName: " + data.bundleName);
@@ -368,7 +368,7 @@ describe('ActsSubscriberTestOrder', function () {
             data.getSubscribeInfo().then(()=>{
                 console.info("===============ActsSubscriberTestOrder_0300=========getSubscribeInfo promise2");
                 Subscriber.subscribe(commonEventSubscriber0301, subscriberCallBack0301);
-                var numindex = 0;
+                let numindex = 0;
                 for (; numindex < 3; ++numindex) {
                     setTimeout(function(){
                         console.debug("===================ActsSubscriberTestOrder_0300 delay 100ms==================");
@@ -388,17 +388,17 @@ describe('ActsSubscriberTestOrder', function () {
     it ('ActsSubscriberTestOrder_0400', 0, async function (done) {
         console.info("===============ActsSubscriberTestOrder_0400===============>");
 
-        var commonEventSubscribeInfo1 = {
+        let commonEventSubscribeInfo1 = {
             events: ["publish_eventOrder0400"],
             priority: 10
         };
 
-        var commonEventSubscribeInfo2 = {
+        let commonEventSubscribeInfo2 = {
             events: ["publish_eventOrder0400"],
             priority: 9
         };
 
-        var commonEventPublishData = {
+        let commonEventPublishData = {
             bundleName: "publish_event0400_bundleName",
             code: 1,
             data: "publish_event0400_init",
@@ -472,17 +472,17 @@ describe('ActsSubscriberTestOrder', function () {
     it ('ActsSubscriberTestOrder_0500', 0, async function (done) {
         console.info("===============ActsSubscriberTestOrder_0500===============>");
 
-        var commonEventSubscribeInfo1 = {
+        let commonEventSubscribeInfo1 = {
             events: ["publish_event0500"],
             priority: 1001
         };
 
-        var commonEventSubscribeInfo2 = {
+        let commonEventSubscribeInfo2 = {
             events: ["publish_event0500"],
             priority: -101
         };
 
-        var commonEventPublishData = {
+        let commonEventPublishData = {
             bundleName: "publish_event0500_bundleName",
             code: 10,
             data: "publish_event0500_init",

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/default/pages/index/index.hml

@@ -15,7 +15,7 @@
  
 <div class="container">
     <text class="title">
-        Hello,Earth! 1111
+        Hello, World! 
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -17,10 +17,10 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 
 describe('ActsSubscriberTestUnorderSystem', async function (done) {
     console.info("===========ActsSubscriberTestUnorderSystem start====================>");
-    var commonEventSubscriber1;
-    var commonEventSubscriber2;
-    var commonEventSubscriber3;
-    var array = [
+    let commonEventSubscriber1;
+    let commonEventSubscriber2;
+    let commonEventSubscriber3;
+    let array = [
             Subscriber.Support.COMMON_EVENT_SHUTDOWN,
             Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED,
             Subscriber.Support.COMMON_EVENT_BATTERY_LOW,
@@ -116,9 +116,9 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
     }
 
     function findArray(str) {
-        var value = false;
-        var index1 = 0;
-        var length = array.length;
+        let value = false;
+        let index1 = 0;
+        let length = array.length;
         for(; index1 < length; ++index1) {
             if (array[index1] == str) {
                 value = true;
@@ -135,7 +135,7 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
      */
     it('ActsSubscriberTestUnorderSystem_0100', 0, async function (done) {
         console.info("===============ActsSubscriberTestUnorderSystem_0100 start==========================>");
-        var commonEventSubscribeInfo = {
+        let commonEventSubscribeInfo = {
             events: [
                     Subscriber.Support.COMMON_EVENT_SHUTDOWN,
                     Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED,
@@ -190,7 +190,7 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
             ],
         };
 
-        var result = 0;
+        let result = 0;
 
         function subscriberCallBack001(err, data) {
             console.info("==========================>subscriberCallBack001 event = "+ data.event);
@@ -226,7 +226,7 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
      */
     it('ActsSubscriberTestUnorderSystem_0200', 0, async function (done) {
         console.info("===============ActsSubscriberTestUnorderSystem_0200 start==========================>");
-        var commonEventSubscribeInfo = {
+        let commonEventSubscribeInfo = {
             events: [
                     Subscriber.Support.COMMON_EVENT_WIFI_HOTSPOT_STATE,
                     Subscriber.Support.COMMON_EVENT_BLUETOOTH_A2DPSOURCE_AVRCP_CONNECT_STATE_UPDATE,
@@ -267,7 +267,7 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
             ],
         };
 
-        var result = 0;
+        let result = 0;
 
         function subscriberCallBack002(err, data) {
             console.info("==========================>subscriberCallBack002 event = "+ data.event);
@@ -304,7 +304,7 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
      */
     it('ActsSubscriberTestUnorderSystem_0300', 0, async function (done) {
         console.info("===============ActsSubscriberTestUnorderSystem_0300 start==========================>");
-        var commonEventSubscribeInfo = {
+        let commonEventSubscribeInfo = {
             events: [
                 Subscriber.Support.COMMON_EVENT_WIFI_P2P_CONN_STATE,
                 Subscriber.Support.COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_DISCOVERED,

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/pages/index/index.hml

@@ -15,7 +15,7 @@
  
 <div class="container">
     <text class="title">
-        Hello,Earth! 1111
+        Hello, World! 
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>

notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.css

-.container {
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+ .container {
     flex-direction: column;
     justify-content: center;
     align-items: center;

notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.hml

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 <div class="container">
     <text class="title">
-        您好，地球1111
+        Hello, World!
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>