diff --git a/.gitignore b/.gitignore index d2e142997f7bf1418da3d3677d2688398be1b216..fd58715a10be52e996476d92986e2588d7e1bfe6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /.idea **/build /signature +/.hvigor +/package.json \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index d0bff52383098706f0e74d26393552619fa7a872..1daeb7c76d639fb186c9a71d350ae2e9e860e835 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -21,6 +21,7 @@ "products": [ { "name": "default", + "signingConfig": "default" } ] }, diff --git a/common/resources/.gitignore b/common/resources/.gitignore index 4f9a973815d0b5e49bc8547681a6b4bc7a178d12..a5c564ae6da6b5e2336628d9f9e2155bddfc399d 100644 --- a/common/resources/.gitignore +++ b/common/resources/.gitignore @@ -1,3 +1,4 @@ /node_modules /.preview -/build \ No newline at end of file +/build +/package.json \ No newline at end of file diff --git a/common/utils/.gitignore b/common/utils/.gitignore index 4f9a973815d0b5e49bc8547681a6b4bc7a178d12..a5c564ae6da6b5e2336628d9f9e2155bddfc399d 100644 --- a/common/utils/.gitignore +++ b/common/utils/.gitignore @@ -1,3 +1,4 @@ /node_modules /.preview -/build \ No newline at end of file +/build +/package.json \ No newline at end of file diff --git a/features/.gitignore b/features/.gitignore index 5a6ba80fa3d9498a23ae8ae7d9518f8743fa8a96..9924c4f298e2f709c65fd11e6020873bd6f6ae54 100644 --- a/features/.gitignore +++ b/features/.gitignore @@ -1,4 +1,5 @@ /node_modules /.preview /build -/.cxx \ No newline at end of file +/.cxx +/package.json \ No newline at end of file diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 8fe0c08e3d4dde2dd8971d8d972a2af6954dc796..ca89cf1e06d3793fe9d1cc5e8ed2a0fe54094454 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -570,7 +570,7 @@ export struct ToolBarComp { // 清单 this.controllerShow.runJavaScript({ script: "javascript:RICH_EDITOR.setTodo()" }) // 退出键盘 - iinputMethod.getController().stopInputSession(); + inputMethod.getController().stopInputSession(); }) }.width(42) .height(42) diff --git a/product/default/.gitignore b/product/default/.gitignore index 4f9a973815d0b5e49bc8547681a6b4bc7a178d12..a5c564ae6da6b5e2336628d9f9e2155bddfc399d 100644 --- a/product/default/.gitignore +++ b/product/default/.gitignore @@ -1,3 +1,4 @@ /node_modules /.preview -/build \ No newline at end of file +/build +/package.json \ No newline at end of file diff --git a/product/default/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts index 9011f1b6cfd3c114f7aeb578364144d7b338da62..4007d731d8db63e0e2e4cab9db2a57d36d7b8294 100644 --- a/product/default/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -23,7 +23,6 @@ import { atob } from 'js-base64' import display from '@ohos.display'; import window from '@ohos.window'; - globalThis.rdbStore = undefined export default class MainAbility extends Ability { @@ -33,11 +32,12 @@ export default class MainAbility extends Ability { // @ts-ignore window.getLastWindow(this.context,(err,data)=>{ let windowWidth = data.getWindowProperties().windowRect.width + LogUtil.info(this.Tag, " getLastWindow:" + windowWidth) this.screenBreakPoints(windowWidth) }) AppStorage.SetOrCreate('closeEditContentDialog', true) - LogUtil.info(this.Tag, " onCreate, launchReason is " + launchParam.launchReason) - LogUtil.info(this.Tag, " onCreate, deviceType" + deviceInfo.deviceType) + LogUtil.info(this.Tag, " onCreate, launchReason is " + launchParam.launchReason + + ", deviceType" + deviceInfo.deviceType) if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') { AppStorage.SetOrCreate('Expand', false) AppStorage.SetOrCreate('Choose', true) @@ -203,6 +203,7 @@ export default class MainAbility extends Ability { displayClass = display.getDefaultDisplaySync() screenDpi = displayClass.densityDPI let windowWidth = data / (screenDpi / 160) + LogUtil.debug(this.Tag, " screenBreakPoints windowWidth: " + windowWidth) if (windowWidth >= 320 && windowWidth < 520 || windowWidth < 320) { AppStorage.SetOrCreate('breakPoint', 'sm') } else if (windowWidth >= 520 && windowWidth < 840) { diff --git a/product/default/src/main/module.json5 b/product/default/src/main/module.json5 index 86c2979fc921bf52faaa1db7da747c39282656e7..884c1bd9ccb2f7c3367b5e1cfcc5b26bd12a0bdd 100644 --- a/product/default/src/main/module.json5 +++ b/product/default/src/main/module.json5 @@ -44,12 +44,18 @@ { "name": "ohos.permission.DISTRIBUTED_DATASYNC", "reason": "$string:distributed_dataSync_permission" - }, + } ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", "uiSyntax": "ets", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "MainAbility",