Merge branch 'master' of gitee.com:openharmony/interface_sdk-js into syscap2

BUILD.gn

@@ -80,6 +80,7 @@ ohos_copy("ets_component") {
     "api/@internal/component/ets/rating.d.ts",
     "api/@internal/component/ets/rect.d.ts",
     "api/@internal/component/ets/refresh.d.ts",
+    "api/@internal/component/ets/rich_text.d.ts",
     "api/@internal/component/ets/row.d.ts",
     "api/@internal/component/ets/row_split.d.ts",
     "api/@internal/component/ets/scroll.d.ts",

api/@internal/component/ets/index.d.ts

@@ -68,6 +68,7 @@
 /// <reference path="./rating.d.ts" />
 /// <reference path="./rect.d.ts" />
 /// <reference path="./refresh.d.ts" />
+/// <reference path="./rich_text.d.ts" />
 /// <reference path="./row.d.ts" />
 /// <reference path="./row_split.d.ts" />
 /// <reference path="./scroll.d.ts" />

api/@internal/component/ets/rich_text.d.ts

@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+/**
+ * Provides an interface for RichText component.
+ * @since 8
+ */
+interface RichTextInterface {
+  /**
+   * Set value.
+   * @since 8
+   */
+  (content: string): RichTextAttribute;
+}
+
+/**
+ * Defines the RichText attribute functions.
+ * @since 8
+ */
+declare class RichTextAttribute extends CommonMethod<RichTextAttribute> {
+  /**
+   * Just use for genetate tsbundle
+   * @ignore ide should ignore this arrtibute
+   */
+  create(content: string): RichTextAttribute;
+
+  /**
+   * Just use for genetate tsbundle
+   * @ignore ide should ignore this arrtibute
+   */
+  pop(): RichTextAttribute;
+
+  /**
+   * Just use for genetate tsbundle
+   * @ignore ide should ignore this arrtibute
+   */
+  debugLine(value: string): RichTextAttribute;
+
+  /**
+   * Triggered when the RichText loading starts.
+   * @since 8
+   */
+  onStart(callback: () => void): RichTextAttribute;
+
+  /**
+   * Triggered when the RichText loading ends.
+   * @since 8
+   */
+  onComplete(callback: () => void): RichTextAttribute;
+}
+
+declare const RichText: RichTextInterface;
+declare const RichTextInstance: RichTextAttribute;

api/@internal/component/ets/web.d.ts

@@ -379,9 +379,13 @@ declare class WebAttribute extends CommonMethod<WebAttribute> {
 
   /**
    * Triggered when notifies the host application that web content from the specified source is attempting to use the Geolocation API
+   * 
+   * @param origin The origin that ask for the geolocation permission.
+   * @param allow The geolocation permission status.
+   * @param retain Whether to allow the geolocation permission status to be saved to the system.
    * @since 8
    */
-  onGeolocationShow(callback: (event?: { origin: string, callback: Function }) => void): WebAttribute;
+  onGeolocationShow(callback: (event?: { origin: string, allow: boolean, retain: boolean }) => void): WebAttribute;
 
   /**
    * Get WebView focus callback event

api/@ohos.application.appManager.d.ts

@@ -34,6 +34,7 @@ declare namespace appManager {
      * @since 8
      * @SysCap SystemCapability.Ability.AbilityRuntime.Core
      * @param observer The application state observer.
+     * @systemapi hide this for inner system use
      * @return Returns the number code of the observer.
      */
     function registerApplicationStateObserver(observer: ApplicationStateObserver): number;
@@ -44,6 +45,7 @@ declare namespace appManager {
      * @since 8
      * @SysCap SystemCapability.Ability.AbilityRuntime.Core
      * @param observerId Indicates the number code of the observer.
+     * @systemapi hide this for inner system use
      * @return -
      */
     function unregisterApplicationStateObserver(observerId: number,  callback: AsyncCallback<void>): void;
@@ -54,6 +56,7 @@ declare namespace appManager {
      *
      * @since 8
      * @SysCap SystemCapability.Ability.AbilityRuntime.Core
+     * @systemapi hide this for inner system use
      * @return Returns the list of AppStateData.
      */
      function getForegroundApplications(callback: AsyncCallback<Array<AppStateData>>): void;