diff --git a/resources/rk3568/pages/rk3568.json b/resources/rk3568/pages/rk3568.json index d03c57ea3646ce47dd502c1433cd09de0b46ee42..381fddad39d045506ffeb00a185eb9cc25e94730 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" : { diff --git a/resources/rk3568/pages/upd.json b/resources/rk3568/pages/upd.json index 0d14f831afabffd211b233b3c606b00af53fc174..5e41881c085b12f025989a0a07a5271647a59768 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": [ diff --git a/test/unittest/test_data/ui/strategy/strategy_valid.json b/test/unittest/test_data/ui/strategy/strategy_valid.json index ca0e09b24d05b5e319fd62e098507c618166bfa5..023caa5c346c8ad715103abf52ae2ccd471c706c 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" : { 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 bde1557dec69c9dd1329f6ea2932a312b6111de3..6fb000a7cd2b3a758b3b2e2d319a2179fcedb717 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;