From 63317ec11367653afa6cec2c0db3ff6fce37254f Mon Sep 17 00:00:00 2001 From: wangkai Date: Fri, 15 Jul 2022 10:13:50 +0800 Subject: [PATCH] =?UTF-8?q?api=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangkai --- .../systemplugin/napi/ohos_data_distributedData.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_data_distributedData.js b/runtime/main/extend/systemplugin/napi/ohos_data_distributedData.js index 290d1c7e..fa3b0545 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_data_distributedData.js +++ b/runtime/main/extend/systemplugin/napi/ohos_data_distributedData.js @@ -229,8 +229,6 @@ export function mockDistributedData() { S4: 6, }, -<<<<<<< HEAD -======= SyncMode: { PULL_ONLY: 0, PUSH_ONLY: 1, @@ -243,7 +241,6 @@ export function mockDistributedData() { SUBSCRIBE_TYPE_ALL: 2, }, ->>>>>>> 21b6c42... api mock change createKVManager: function (...args) { console.warn("distributedData.createKVManager interface mocked in the Previewer." + " How this interface works on the Previewer may be different from that on a real device.") @@ -310,17 +307,6 @@ export function mockDistributedData() { deleteEntries: new Array(entryMock), deviceId: "[PC Preview] unknown deviceId" }; - const syncModeMock = { - PULL_ONLY: "[PC Preview] unknown PULL_ONLY", - PUSH_ONLY: "[PC Preview] unknown PUSH_ONLY", - PUSH_PULL: "[PC Preview] unknown PUSH_PULL" - }; - const subscribeTypeMock = { - SUBSCRIBE_TYPE_LOCAL: "[PC Preview] unknown SUBSCRIBE_TYPE_LOCAL", - SUBSCRIBE_TYPE_REMOTE: "[PC Preview] unknown SUBSCRIBE_TYPE_REMOTE", - SUBSCRIBE_TYPE_ALL: "[PC Preview] unknown SUBSCRIBE_TYPE_ALL" - }; - const optionsMock = { createIfMissing: "[PC Preview] unknown createIfMissing", encrypt: "[PC Preview] unknown encrypt",