From dfd05f6ceb6fb7e98b7e0a5efeb4d660268f75ae Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sun, 29 Sep 2024 14:21:00 +0800 Subject: [PATCH] =?utf8?q?=E5=88=A0=E9=99=A4mainPresenterSample=E6=96=87?= =?utf8?q?=E4=BB=B6=E4=B8=AD=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/main/src/MainPresenterSample.cpp | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 77a42392a..166bf839b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -47,13 +47,6 @@ namespace OHOS { std::map g_jumpView = { - {DROPDOWN_CLICK_SETTING, VIEW_SETTING}, // 设置 - {DROPDOWN_CLICK_BLUETOOTH, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙 - {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB}, // 勿扰 -#ifdef SUPPORT_ALIPAY_SEC - {DROPDOWN_CLICK_SAVEELE, VIEW_MAIN_ALIPAY}, // 支付宝 -#endif - {DROPDOWN_CLICK_FINDMYPHONE, VIEW_NETWORKANDCALL}, // 4G {MAIN_CLICK_BLOOD, VIEW_BLOOD_CHECK}, // 血氧检查 {MAIN_CLICK_SETCARD, VIEW_ADD_CARD}, // 卡片管理 }; @@ -139,38 +132,6 @@ namespace OHOS return true; } - if (uapi_sleep_mode_flag_get()) - { - if (VIEW_DNOTDISTURB == g_jumpView[curViewId]) - { - return true; - } - } - - if (curViewId == DROPDOWN_CLICK_DONOTDISTURB) - { -#if 0 - if (HealthModel::GetInstance()->GetDntDistStatus() == 0) { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_DN_DISTURB_B); - HealthModel::GetInstance()->UpdateDntDistStatus(1); - } else { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_DN_DISTURB); - HealthModel::GetInstance()->UpdateDntDistStatus(0); - } - } - if (curViewId == DROPDOWN_CLICK_BRIGHTENSCREEN) { - if (HealthModel::GetInstance()->GetBriScrStatus() == 0) { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN_B); - HealthModel::GetInstance()->UpdateBriScrStatus(1); - ScreenOffEnable(0); - } else { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN); - HealthModel::GetInstance()->UpdateBriScrStatus(0); - ScreenOffEnable(1); - } -#endif - } - if (curViewId == CONNECTEDSTATUSBACKGROUNDBUTTON) { PullUpDownView::GetInstance()->ChangeView(DROPDOWNVIEW, CONNECTEDSTATUSVIEW); @@ -203,15 +164,6 @@ namespace OHOS MainModel::GetInstance().SetFromSetCardView(true); MainModel::GetInstance().SetFromCardId(SETCARD); } - // 如果勿扰模式是开启状态,在下拉界面点击勿扰快捷入口会关闭勿扰模式不进入勿扰视图 - if (g_jumpView[curViewId] == VIEW_DNOTDISTURB && DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled() == true) - { - PullUpDownView::GetInstance()->UpdateDnotDisturbStatus(false); - DnotDisturbModel::GetInstance().SetDoNotDisturbModeEnabled(false); - /*更新主界面配置*/ - MainModel::GetInstance().setDialState(DialState::DO_NOT_DISTURB, false); - return true; - } if (g_jumpView.count(curViewId) != 0) { NativeAbility::GetInstance().EnterSlice(g_jumpView[curViewId]); -- 2.17.1