!19535 【资料问题】挑单补充处理废弃接口引入问题

Merge pull request !19535 from yuyaozhi/OpenHarmony-4.0-Beta1

zh-cn/application-dev/application-models/access-dataability.md

@@ -11,7 +11,7 @@
 
 - @ohos.data.dataAbility
 
-- @ohos.data.rdb
+- @ohos.data.relationalStore
 
 
 访问DataAbility的示例代码如下：
@@ -23,7 +23,7 @@
    // 作为参数传递的URI,与config中定义的URI的区别是多了一个"/",有三个"/"
    import featureAbility from '@ohos.ability.featureAbility'
    import ohos_data_ability from '@ohos.data.dataAbility'
-   import ohos_data_rdb from '@ohos.data.rdb'
+   import relationalStore from '@ohos.data.relationalStore'
    
    let urivar = "dataability:///com.ix.DataAbility"
    let DAHelper = featureAbility.acquireDataAbilityHelper(urivar);

zh-cn/application-dev/application-models/application-context-fa.md

@@ -48,13 +48,13 @@ let context = featureAbility.getContext()
    
    ```ts
    import featureAbility from '@ohos.ability.featureAbility'
-   import bundle from '@ohos.bundle';
+   import bundleManager from '@ohos.bundle.bundleManager';
    
    export default {
      onCreate() {
        // 获取context并调用相关方法
        let context = featureAbility.getContext();
-       context.setDisplayOrientation(bundle.DisplayOrientation.LANDSCAPE).then(() => {
+       context.setDisplayOrientation(bundleManager.DisplayOrientation.LANDSCAPE).then(() => {
            console.info("Set display orientation.")
        })
        console.info('Application onCreate')

zh-cn/application-dev/application-models/connect-serviceability.md

@@ -17,14 +17,14 @@ PageAbility创建连接本地ServiceAbility回调实例的代码以及连接本
 
 ```ts
 import rpc from "@ohos.rpc"
-import prompt from '@system.prompt'
+import promptAction from '@ohos.promptAction'
 import featureAbility from '@ohos.ability.featureAbility'
 
 let option = {
   onConnect: function onConnectCallback(element, proxy) {
     console.info(`onConnectLocalService onConnectDone`)
     if (proxy === null) {
-      prompt.showToast({
+      promptAction.showToast({
         message: "Connect service failed"
       })
       return
@@ -34,19 +34,19 @@ let option = {
     let option = new rpc.MessageOption()
     data.writeInterfaceToken("connect.test.token")
     proxy.sendRequest(0, data, reply, option)
-    prompt.showToast({
+    promptAction.showToast({
       message: "Connect service success"
     })
   },
   onDisconnect: function onDisconnectCallback(element) {
     console.info(`onConnectLocalService onDisconnectDone element:${element}`)
-    prompt.showToast({
+    promptAction.showToast({
       message: "Disconnect service success"
     })
   },
   onFailed: function onFailedCallback(code) {
     console.info(`onConnectLocalService onFailed errCode:${code}`)
-    prompt.showToast({
+    promptAction.showToast({
       message: "Connect local service onFailed"
     })
   }

zh-cn/application-dev/application-models/create-dataability.md

@@ -9,18 +9,18 @@
 ```ts
 import featureAbility from '@ohos.ability.featureAbility'
 import dataAbility from '@ohos.data.dataAbility'
-import dataRdb from '@ohos.data.rdb'
+import relationalStore from '@ohos.data.relationalStore'
 
 const TABLE_NAME = 'book'
 const STORE_CONFIG = { name: 'book.db' }
 const SQL_CREATE_TABLE = 'CREATE TABLE IF NOT EXISTS book(id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, introduction TEXT NOT NULL)'
-let rdbStore: dataRdb.RdbStore = undefined
+let rdbStore: relationalStore.RdbStore = undefined
 
 export default {
   onInitialized(abilityInfo) {
     console.info('DataAbility onInitialized, abilityInfo:' + abilityInfo.bundleName)
     let context = featureAbility.getContext()
-    dataRdb.getRdbStore(context, STORE_CONFIG, 1, (err, store) => {
+    relationalStore.getRdbStore(context, STORE_CONFIG, (err, store) => {
       console.info('DataAbility getRdbStore callback')
       store.executeSql(SQL_CREATE_TABLE, [])
       rdbStore = store

zh-cn/application-dev/application-models/js-ui-widget-development.md

@@ -102,7 +102,7 @@ Stage卡片开发，即基于[Stage模型](stage-model-development-overview.md)
    import formBindingData from '@ohos.app.form.formBindingData';
    import formInfo from '@ohos.app.form.formInfo';
    import formProvider from '@ohos.app.form.formProvider';
-   import dataStorage from '@ohos.data.storage';
+   import dataPreferences from '@ohos.data.preferences';
    ```
 
 2. 在EntryFormAbility.ts中，实现FormExtension生命周期接口。
@@ -255,7 +255,7 @@ async function storeFormInfo(formId: string, formName: string, tempFlag: boolean
         "updateCount": 0
     };
     try {
-        const storage = await dataStorage.getStorage(DATA_STORAGE_PATH);
+        const storage = await dataPreferences.getPreferences(this.context, DATA_STORAGE_PATH);
         // put form info
         await storage.put(formId, JSON.stringify(formInfo));
         console.info(`[EntryFormAbility] storeFormInfo, put form info successfully, formId: ${formId}`);
@@ -294,7 +294,7 @@ export default class EntryFormAbility extends FormExtension {
 const DATA_STORAGE_PATH = "/data/storage/el2/base/haps/form_store";
 async function deleteFormInfo(formId: string) {
     try {
-        const storage = await dataStorage.getStorage(DATA_STORAGE_PATH);
+        const storage = await dataPreferences.getPreferences(this.context, DATA_STORAGE_PATH);
         // del form info
         await storage.delete(formId);
         console.info(`[EntryFormAbility] deleteFormInfo, del form info successfully, formId: ${formId}`);

zh-cn/application-dev/application-models/widget-development-fa.md

@@ -114,7 +114,7 @@ FA卡片开发，即基于[FA模型](fa-model-development-overview.md)的卡片
    import formBindingData from '@ohos.app.form.formBindingData';
    import formInfo from '@ohos.app.form.formInfo';
    import formProvider from '@ohos.app.form.formProvider';
-   import dataStorage from '@ohos.data.storage';
+   import dataPreferences from '@ohos.data.preferences';
    ```
 
 2. 在form.ts中，实现卡片生命周期接口
@@ -263,7 +263,7 @@ async function storeFormInfo(formId: string, formName: string, tempFlag: boolean
         "updateCount": 0
     };
     try {
-        const storage = await dataStorage.getStorage(DATA_STORAGE_PATH);
+        const storage = await dataPreferences.getPreferences(this.context, DATA_STORAGE_PATH);
         // put form info
         await storage.put(formId, JSON.stringify(formInfo));
         console.info(`storeFormInfo, put form info successfully, formId: ${formId}`);
@@ -301,7 +301,7 @@ async function storeFormInfo(formId: string, formName: string, tempFlag: boolean
 const DATA_STORAGE_PATH = "/data/storage/el2/base/haps/form_store";
 async function deleteFormInfo(formId: string) {
     try {
-        const storage = await dataStorage.getStorage(DATA_STORAGE_PATH);
+        const storage = await dataPreferences.getPreferences(this.context, DATA_STORAGE_PATH);
         // del form info
         await storage.delete(formId);
         console.info(`deleteFormInfo, del form info successfully, formId: ${formId}`);

zh-cn/application-dev/reference/apis/js-apis-inner-ability-dataAbilityHelper.md

@@ -18,7 +18,7 @@ import ability from '@ohos.ability.ability';
 使用前根据具体情况引入如下模块
 ```ts
 import ohos_data_ability from '@ohos.data.dataAbility';
-import ohos_data_rdb from '@ohos.data.rdb';
+import relationalStore from '@ohos.data.relationalStore'
 ```
 
 ## DataAbilityHelper.openFile

zh-cn/application-dev/reference/apis/js-apis-inner-application-serviceExtensionContext.md

@@ -985,7 +985,7 @@ terminateSelf(callback: AsyncCallback<void>): void;
 
 terminateSelf(): Promise<void>;
 
-停止自身。通过Promise返回结果。
+停止ability自身。通过Promise返回结果。
 
 **系统能力**：SystemCapability.Ability.AbilityRuntime.Core