From 5c6065ae21002662a46eaa915dcf16c3f0b7bd9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Apr 2025 07:59:12 +0000 Subject: [PATCH 1/4] update resources/rk3568/pages/rk3568.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- resources/rk3568/pages/rk3568.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/rk3568/pages/rk3568.json b/resources/rk3568/pages/rk3568.json index d03c57ea..381fddad 100644 --- a/resources/rk3568/pages/rk3568.json +++ b/resources/rk3568/pages/rk3568.json @@ -51,7 +51,7 @@ }, "resPage" : { "successPageId" : "upd:updateSuccess", - "failPageId" : "upd:updateFailedNoButton" + "failPageId" : "upd:normalUpdateFailed" } }, "factoryRst" : { -- Gitee From 127fda9d8fe049a1fe73a340b4a448e68074bca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Apr 2025 07:59:57 +0000 Subject: [PATCH 2/4] update resources/rk3568/pages/upd.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- resources/rk3568/pages/upd.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resources/rk3568/pages/upd.json b/resources/rk3568/pages/upd.json index 0d14f831..5e41881c 100644 --- a/resources/rk3568/pages/upd.json +++ b/resources/rk3568/pages/upd.json @@ -52,14 +52,6 @@ ], "bgColor" : "#000000ff" }, - { - "id": "updateFailedNoButton", - "coms": [ - "FailIcon_Image", - "UpdateInfoDark_Label" - ], - "bgColor" : "#000000ff" - }, { "id": "FactoryRstFailed", "coms": [ -- Gitee From 20dfea8f664f710d2cf9d9dda000e58dbdd5a4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Apr 2025 08:01:04 +0000 Subject: [PATCH 3/4] update test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp b/test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp index bde1557d..6fb000a7 100644 --- a/test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp +++ b/test/unittest/updater_ui_test/strategy/ui_strategy_unittest.cpp @@ -74,7 +74,7 @@ HWTEST_F(UpdaterUiStrategyUnitTest, test_load_strategy_for_each_mode, TestSize.L sdCardCfg.progressPage = ProgressPage {"upd:sdUpdate", "UpdBox_Progress", "bar", "OHOSIcon_Image", "img", "PowerLongPressWarning_Image"}; sdCardCfg.labelLogResId = {"upd", "UpdateInfoDark_Label"}; - sdCardCfg.resPage = {"upd:updateSuccess", "upd:updateFailedNoButton"}; + sdCardCfg.resPage = {"upd:updateSuccess", "upd:normalUpdateFailed"}; auto &factoryRstCfg = expected[UPDATERMODE_FACTORYRST]; factoryRstCfg = defaultCfg; -- Gitee From 00e57cd16cd2a3f78288691a7b040a997cba3a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Apr 2025 08:09:05 +0000 Subject: [PATCH 4/4] update test/unittest/test_data/ui/strategy/strategy_valid.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- test/unittest/test_data/ui/strategy/strategy_valid.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/test_data/ui/strategy/strategy_valid.json b/test/unittest/test_data/ui/strategy/strategy_valid.json index ca0e09b2..023caa5c 100644 --- a/test/unittest/test_data/ui/strategy/strategy_valid.json +++ b/test/unittest/test_data/ui/strategy/strategy_valid.json @@ -41,7 +41,7 @@ }, "resPage" : { "successPageId" : "upd:updateSuccess", - "failPageId" : "upd:updateFailedNoButton" + "failPageId" : "upd:normalUpdateFailed" } }, "factoryRst" : { -- Gitee