!2559 power、sensor、multimodalinput license&拼写错误整改

Merge pull request !2559 from logic42/cherry-pick-1647498067

multimodalinput/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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

multimodalinput/input_js_standard/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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

multimodalinput/input_js_standard/src/main/js/default/app.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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

multimodalinput/input_js_standard/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;

multimodalinput/input_js_standard/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">
         {{ $t('strings.hello') }} {{ title }}

multimodalinput/input_js_standard/src/main/js/default/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import {Core, ExpectExtend} from 'deccjsunit/index'
+import { Core, ExpectExtend } from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')

multimodalinput/input_js_standard/src/main/js/default/test/InputConsumer.test.js

 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * 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

multimodalinput/input_js_standard/src/main/js/default/test/InputDevice.test.js

 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * 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

multimodalinput/input_js_standard/src/main/js/default/test/ListMultimodalinput.test.js

 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * 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

powermgr/powermgrbattery/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

powermgr/powermgrbattery/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

powermgr/powermgrbattery_rk3568/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

powermgr/powermgrbattery_rk3568/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

powermgr/powermgrthermal/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

powermgr/powermgrthermal/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

sensors/miscdevice_standard/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

sensors/miscdevice_standard/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

sensors/sensor_standard/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2021 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;

sensors/sensor_standard/src/main/js/default/pages/index/index.hml

+<!--
+  Copyright (c) 2021 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">
         {{ $t('strings.hello') }} {{ title }}

sensors/sensor_standard/src/main/js/default/test/SensorGeneralalgorithm.test.js

@@ -627,7 +627,7 @@ describe("SensorJsTest", function () {
     it('SensorJsTest_088', 0, async function (done) {
         console.info('SensorJsTest_088 start')
         sensor.createQuaternion([0.52, -0.336, -0.251], (error, data) => {
-            console.info('SensorJsTest_088' + 'lengh:' + data.length);
+            console.info('SensorJsTest_088' + 'length:' + data.length);
             if (error) {
                 console.info('SensorJsTest_088 failed');
                 expect(false).assertTrue();
@@ -929,7 +929,7 @@ describe("SensorJsTest", function () {
                 expect(data).assertEqual(getGeomagneticDipResult[0])
             }
             done()
-            console.info('SensorJsTest_101' + 'lengh:' + data.length);
+            console.info('SensorJsTest_101' + 'length:' + data.length);
         })
         console.info("SensorJsTest_101 end")
     })

sensors/sensor_standard/src/main/js/default/test/SensorOnOffTest.test.js

@@ -46,6 +46,9 @@ describe('SystemParameterTest', function () {
         console.info('afterEach caled')
     })
 
+    let testSensorId = 0;
+    let testNullSensorId = -1;
+
     /**
      * @tc.number    SUB_SENSORS_Sensor_JSTest_0010
      * @tc.name      testRegisterSensortest001
@@ -53,20 +56,16 @@ describe('SystemParameterTest', function () {
      */
     it('SUB_SENSORS_Sensor_JSTest_0010', 0, async function (done) {
         console.info('SUB_SENSORS_Sensor_JSTest_0010 start');
-        await sensor.on(0, function (error, data) {
-            if (error) {
-                if (error.code == -1) {
-                    console.info("testRegisterSensortest001 on error: sensor 0 not exit")
-                } else {
-                    console.info('testRegisterSensortest001  on error :' + error.code);
-                    expect(false).assertTrue();
-                }
-                done();
-            } else {
+        await sensor.on(testSensorId, function (data) {
+            if (data) {
                 console.info('testRegisterSensortest001  on success');
                 expect(data.x).assertInstanceOf('Number');
                 expect(data.timestamp).assertInstanceOf('Number');
                 done();
+            } else {
+                console.info('testRegisterSensortest001  on error');
+                expect(false).assertTrue();
+                done();
             }
         });
         console.info('SUB_SENSORS_Sensor_JSTest_0010 end');
@@ -79,17 +78,17 @@ describe('SystemParameterTest', function () {
      */
     it('SUB_SENSORS_Sensor_JSTest_0020', 0, async function (done) {
         console.info('SUB_SENSORS_Sensor_JSTest_0020 start');
-        await sensor.on(-1, function (error, data) {
-            if (error) {
-                console.info('testRegisterSensortest002  on error');
-                expect(true).assertTrue();
-                done();
-            } else {
+        await sensor.on(testNullSensorId, function (data) {
+            if (data) {
                 console.info('testRegisterSensortest002  on success');
                 expect(false).assertTrue();
                 done();
             }
         });
+        setTimeout(() => {
+            expect(true).assertTrue();
+            done();
+        }, 500)
         console.info('SUB_SENSORS_Sensor_JSTest_0020 end');
     })