其他卡片取消进入卡片设置 417/4
authorCaisking <3449750381@qq.com>
Sat, 29 Jun 2024 10:23:20 +0000 (18:23 +0800)
committerCaisking <3449750381@qq.com>
Sat, 29 Jun 2024 10:23:20 +0000 (18:23 +0800)
code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp

index 657e9f5..4b0b1dc 100644 (file)
@@ -38,11 +38,11 @@ namespace OHOS
 {
 
     std::map<std::string, AppViewId> g_jumpView = {
-        {DROPDOWN_CLICK_SETTING, VIEW_SETTING},            // 设置
+        {DROPDOWN_CLICK_SETTING, VIEW_SETTING},             // 设置
         {DROPDOWN_CLICK_BLUETOOTH, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙
-        {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB},    // 勿扰
-        {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE},            // 省电模式
-        {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE},     // 查找手机
+        {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB},     // 勿扰
+        {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE},             // 省电模式
+        {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE},      // 查找手机
     };
 
     static MainPresenterSample *g_pMainPresenterSample = nullptr;
@@ -144,13 +144,13 @@ namespace OHOS
         if (curViewId == CONNECTEDSTATUSBACKGROUNDBUTTON)
         {
             PullUpDownView::GetInstance()->ChangeView(DROPDOWNVIEW, CONNECTEDSTATUSVIEW);
-            PullUpDown_StopTimer(); //切换到连接状态视图时停止定时器
+            PullUpDown_StopTimer(); // 切换到连接状态视图时停止定时器
             return true;
         }
         else if (curViewId == CONNECTEDSTATUSVIEWCLOSEBUTTON)
         {
             PullUpDownView::GetInstance()->ChangeView(CONNECTEDSTATUSVIEW, DROPDOWNVIEW);
-            PullUpDown_StartTimer(1000);//切回下拉控制中心视图开启定时器
+            PullUpDown_StartTimer(1000); // 切回下拉控制中心视图开启定时器
             return true;
         }
         // if(&view == PullUpDownView::GetInstance()->GetConnectedStatusView()->GetCloseButton())
@@ -184,7 +184,7 @@ namespace OHOS
         if (cardId != WATCH_FACE)
         {
             SetCardModel::GetInstance().SetSelectedCard(cardId);
-            NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD);
+            // NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD);
         }
         else
         {