diff --git a/ArkUIKit/NativeDialogSample/entry/src/main/cpp/customdialog/customdialogexample.cpp b/ArkUIKit/NativeDialogSample/entry/src/main/cpp/customdialog/customdialogexample.cpp index f3fe5608e118793cc9580d00319987f99c5027c7..40464e1c909f93d8c33e0e82a0d5a3349f5c0c6d 100644 --- a/ArkUIKit/NativeDialogSample/entry/src/main/cpp/customdialog/customdialogexample.cpp +++ b/ArkUIKit/NativeDialogSample/entry/src/main/cpp/customdialog/customdialogexample.cpp @@ -798,7 +798,7 @@ bool CreateCustomDialog() OH_ArkUI_CustomDialog_GetState(reinterpret_cast(g_dialogOption), &state); ShowDialogState(state); InitDialogOptions(g_dialogOption, column); - CreateStyledButton(nodeAPI, column, "close", MyOnClose); + CreateStyledButton(nodeAPI, column, "Close Dialog", MyOnClose); g_isOpenDialog = true; return true; } @@ -822,7 +822,11 @@ int32_t CustomDialogTest::SetCustomDialogDialogAttribute(int32_t nodeType, uint3 static void CloseApplication() { std::lock_guard lock(g_dialogIdMutex); - OH_ArkUI_CustomDialog_DisposeOptions(g_dialogOption); + if (globalCustomDialog) { + g_dialogAPI3->nativeDialogAPI1.dispose(globalCustomDialog); + } else { + OH_ArkUI_CustomDialog_DisposeOptions(g_dialogOption); + } } napi_value CustomDialogTest::SetCustomDialog(napi_env env, napi_callback_info info) @@ -1676,7 +1680,6 @@ static void HandleDialogCloseEvent() OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "ControllerTest", "HandleDialogCloseEvent close failed, ret = %{public}d ", ret); } - g_dialogAPI3->nativeDialogAPI1.dispose(globalCustomDialog); globalCustomDialog = nullptr; g_dialogAPI3 = nullptr; g_isOpenController = false; @@ -1808,7 +1811,6 @@ napi_value CustomDialogTest::ResetDialogController(napi_env env, napi_callback_i if (globalCustomDialog || g_dialogAPI3) { g_dialogAPI3->nativeDialogAPI1.removeContent(globalCustomDialog); g_dialogAPI3->nativeDialogAPI1.close(globalCustomDialog); - g_dialogAPI3->nativeDialogAPI1.dispose(globalCustomDialog); globalCustomDialog = nullptr; g_dialogAPI3 = nullptr; g_isOpenController = false; diff --git a/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexController.ets b/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexController.ets index 8e256289acf18d4a8248c84307c569199800120e..bc16ae5ca5174a568e51d6044fc927a219b8ec30 100644 --- a/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexController.ets +++ b/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexController.ets @@ -485,20 +485,12 @@ struct Index { build() { Column() { - Row() { - Button($r('app.string.return_dialog')) - .height(20) - .width('20%') - .onClick(() => { - this.getUIContext().getRouter().back(); - }) Text($r('app.string.dialog_controller')) .fontColor(0x0000FF) .height('10%') - .fontSize(10) + .fontSize(15) .margin(10) .fontWeight(FontWeight.Bold) - } Column({ space: 10 }) { Text($r('app.string.configure_popup_properties')) .fontSize(20) @@ -577,11 +569,14 @@ struct Index { this.printDefaultText = true; } }) - }.margin({ - top: 27, - left: 12, - right: 12 - }) + Button($r('app.string.return_dialog')) + .width('40%') + .height('8%') + .margin({top: -130}) + .onClick(() => { + this.getUIContext().getRouter().back(); + }) + } .height('100%') .width('100%') } diff --git a/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexCustomDialog.ets b/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexCustomDialog.ets index 6befb39a8ca4f704e4aad067e2e10fc55a43ee6f..80557d1061a039ac2db878aae7c4a9c1e73cf824 100644 --- a/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexCustomDialog.ets +++ b/ArkUIKit/NativeDialogSample/entry/src/main/ets/pages/IndexCustomDialog.ets @@ -416,20 +416,12 @@ struct Index { build() { Column() { - Row() { - Button($r('app.string.return_dialog')) - .height(20) - .width('20%') - .onClick(() => { - this.getUIContext().getRouter().back(); - }) Text($r('app.string.open_custom_dialog')) .fontColor(0x0000FF) .height('10%') - .fontSize(10) + .fontSize(15) .margin(10) .fontWeight(FontWeight.Bold) - } Column({ space: 10 }) { Text($r('app.string.configure_popup_properties')) .fontSize(20) @@ -508,11 +500,14 @@ struct Index { this.printDefaultText = true; } }) - }.margin({ - top: 27, - left: 12, - right: 12 - }) + Button($r('app.string.return_dialog')) + .width('40%') + .height('8%') + .margin({top: -130}) + .onClick(() => { + this.getUIContext().getRouter().back(); + }) + } .height('100%') .width('100%') } diff --git a/ArkUIKit/NativeDialogSample/entry/src/main/resources/base/element/string.json b/ArkUIKit/NativeDialogSample/entry/src/main/resources/base/element/string.json index b44017e00c2e4fecc1e31e69449383639c1e9fb4..1955517ec7aaed7a8de03ff426d1d4eaa53e9533 100644 --- a/ArkUIKit/NativeDialogSample/entry/src/main/resources/base/element/string.json +++ b/ArkUIKit/NativeDialogSample/entry/src/main/resources/base/element/string.json @@ -62,7 +62,7 @@ }, { "name": "return_dialog", - "value": "<-" + "value": "返回" } ] } \ No newline at end of file diff --git a/ArkUIKit/NativeDialogSample/ohTest.md b/ArkUIKit/NativeDialogSample/ohosTest.md similarity index 98% rename from ArkUIKit/NativeDialogSample/ohTest.md rename to ArkUIKit/NativeDialogSample/ohosTest.md index ee1447f8c02b497e424bafc74886f82a8aaa0942..bf197ddd4e1bfaeee60c49251773698f332c8232 100644 --- a/ArkUIKit/NativeDialogSample/ohTest.md +++ b/ArkUIKit/NativeDialogSample/ohosTest.md @@ -40,10 +40,10 @@ | 是否获取焦点示例验证 | 应用位于首页 | 1.点击 CustomDialogController_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 是否开启模态样式弹窗 选择否
4.点击 是否获取焦点 选择 否。
5.点击 点此打开弹窗按钮 查看验证结果
6.点击 弹框中Close Dialog 按钮
7.点击 重置属性按钮 | 点击输入框 打开键盘 点击弹框内区域 键盘不回收 | 是 | Pass | | 设置弹窗的背景模糊效果示例验证 | 应用位于首页 | 1.点击 CustomDialogController_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 设置弹窗的背景模糊效果。
4.点击 点此打开弹窗按钮 查看验证结果
5.点击 弹框中Close Dialog 按钮
6.点击 重置属性按钮 | 设置自定义弹窗的背景效果参数 | 是 | Pass | | 设置自定义弹窗的背景效果参数示例验证 | 应用位于首页 | 1.点击 CustomDialogController_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 设置自定义弹窗的背景效果参数。
4.点击 点此打开弹窗按钮 查看验证结果
5.点击 弹框中Close Dialog 按钮
6.点击 重置属性按钮 | 弹框内部颜色有变化 | 是 | Pass | -| <- 按钮 示例验证 | 应用位于首页 | 1.点击 CustomDialogController_CAPI对接示例按钮
2.点击 <- 按钮 | 返回上一层 | 是 | Pass | +| 返回按钮 示例验证 | 应用位于首页 | 1.点击 CustomDialogController_CAPI对接示例按钮
2.点击 返回按钮 | 返回上一层 | 是 | Pass | | 弹框创建/打开/关闭示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 点此打开弹窗按钮 查看验证结果
3.点击 弹框中Close Dialog 按钮
4.点击 重置属性按钮 | 弹框创建、打开、关闭成功 | 是 | Pass | | 应用退出示例验证 | 应用位于首页 | 1.点击 关闭应用按钮 | 应用退出 | 是 | Pass | -| <-按钮 示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 <- 按钮 | 返回上一层 | 是 | Pass | +| 返回按钮 示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 返回按钮 | 返回上一层 | 是 | Pass | | 设置弹窗的显示层示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 设置弹窗的显示层级 是 / 否
4.点击 点此打开弹窗按钮 查看验证结果
5.点击 弹框中Close Dialog 按钮
6.点击 重置属性按钮 | 属性设置结果显示
ARKUI_LEVEL_MODE_OVERLAY / ARKUI_LEVEL_MODE_EMBEDDED | 是 | Pass | | 设置背景颜色示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 背景颜色：红色
4.点击 点此打开弹窗按钮 查看验证结果
5.点击 弹框中Close Dialog 按钮
6.点击 重置属性按钮 | 背景颜色：红色 | 是 | Pass | | 圆角半径示例验证 | 应用位于首页 | 1.点击 OpenCustomDialog_CAPI对接示例按钮
2.点击 设置属性按钮
3.点击 圆角半径：15
4.点击 点此打开弹窗按钮 查看验证结果
5.点击 弹框中Close Dialog 按钮
6.点击 重置属性按钮 | 弹窗中的圆角比不设置任何属性点击打开弹窗是四边圆角值小 | 是 | Pass | diff --git a/ArkUIKit/NativeDialogSample/screenshots/CustomDialogController.png b/ArkUIKit/NativeDialogSample/screenshots/CustomDialogController.png index 9e9aae3afbf6979b0a2dd869ca6fb6d7088e9ef1..5f61f6bce9996973fce990f2b44c159998a14d3e 100644 Binary files a/ArkUIKit/NativeDialogSample/screenshots/CustomDialogController.png and b/ArkUIKit/NativeDialogSample/screenshots/CustomDialogController.png differ diff --git a/ArkUIKit/NativeDialogSample/screenshots/OpenCustomDialog.png b/ArkUIKit/NativeDialogSample/screenshots/OpenCustomDialog.png index a4bb3e8abacc5421c892d7c924fea38261b4200c..3360d73e2f0d5967f9e14c097848e52b9ed8de7f 100644 Binary files a/ArkUIKit/NativeDialogSample/screenshots/OpenCustomDialog.png and b/ArkUIKit/NativeDialogSample/screenshots/OpenCustomDialog.png differ