fd272:下拉界面去除4g和支付宝

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPage1.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPage1.h
index 2989d3b..33ff556 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPage1.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPage1.h
@@ -49,11 +49,10 @@ namespace OHOS
         void ClearAll();
 
         UIToggleButton *GetDropDownCardPage1_ToggleButton(int index);
-        void UpdateBTState(bool state);
-        void Updat4GState(bool state);
         void UpdateDnotdisturbState(bool state);
         void UpdateSleepModelState(bool state);
-        void Refresh4GState();
+
+        void SetApplistDisplay(void);
 
     private:
         UIToggleButton *ToggleButtonInit(ToggleButtonConfig &toggleButtonConfig);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPageUiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPageUiConfig.h
new file mode 100644 (file)
index 0000000..c13fbe8
--- /dev/null
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dropdown/DropDownCardPageUiConfig.h
@@ -0,0 +1,53 @@
+#ifndef DROPDOWN_CARD_PAGE_UI_CONFIG_H
+#define DROPDOWN_CARD_PAGE_UI_CONFIG_H
+
+namespace OHOS
+{
+    // viewId
+    static constexpr const char *DROPDOWN_BT_TOGGLEBUTTON_VIEWID = "dropdown_bt";                           // 蓝牙
+    static constexpr const char *DROPDOWN_4G_TOGGLEBUTTON_VIEWID = "dropdown_4g";                           // 4g
+    static constexpr const char *DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID = "dropdown_ALIPAY";                   // 支付宝
+    static constexpr const char *DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID = "dropdown_savepower";             // 省电模式
+    static constexpr const char *DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID = "dropdown_sleep";                     // 睡眠模式
+    static constexpr const char *DROPDOWN_DNOTDISTURB_TOGGLEBUTTON_VIEWID = "dropdown_dnotdisturb";         // 勿扰模式
+    static constexpr const char *DROPDOWN_SETTING_TOGGLEBUTTON_VIEWID = "dropdown_setting";                 // 设置
+    static constexpr const char *DROPDOWN_FINDPHONE_TOGGLEBUTTON_VIEWID = "dropdown_findphone";             // 查找手机
+    static constexpr const char *DROPDOWN_LIGHTING_TOGGLEBUTTON_VIEWID = "dropdown_4g";                     // 手电筒
+    static constexpr const char *DROPDOWN_APPLIST_DISPLAY_TOGGLEBUTTON_VIEWID = "dropdown_applist_display"; // 列表样式
+
+    // 蓝牙
+    static constexpr const char *DROPDOWN_BT_IMAGE = "/user/res/dropdown/DROPDOWN_BT.bin";
+
+    // 省电模式
+    static constexpr const char *DROPDOWN_SAVEPOWER_ON_IMAGE = "/user/res/dropdown/DROPDOWN_SAVEPOWER_ON.bin";
+    static constexpr const char *DROPDOWN_SAVEPOWER_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_SAVEPOWER_OFF.bin";
+
+    // 睡眠模式
+    static constexpr const char *DROPDOWN_SLEEP_ON_IMAGE = "/user/res/dropdown/DROPDOWN_SLEEP_ON.bin";
+    static constexpr const char *DROPDOWN_SLEEP_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_SLEEP_OFF.bin";
+
+    // 勿扰模式
+    static constexpr const char *DROPDOWN_DNOTDISTURB_ON_IMAGE = "/user/res/dropdown/DROPDOWN_DNOTDISTURB_ON.bin";
+    static constexpr const char *DROPDOWN_DNOTDISTURB_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_DNOTDISTURB_OFF.bin";
+
+    // 设置
+    static constexpr const char *DROPDOWN_SETTING_IMAGE = "/user/res/dropdown/DROPDOWN_SETTING.bin";
+
+    // 查找手机
+    static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_FINDPHONE.bin";
+
+    // 手电筒
+    static constexpr const char *DROPDOWN_LIGHTING_IMAGE = "/user/res/dropdown/DROPDOWN_LIGHTING.bin";
+
+    // 列表样式
+    static constexpr const char *DROPDOWN_APPLIST_DISPLAY_IMAGE[] =
+        {
+            "/user/res/themestyle/list.bin",      // 列表
+            "/user/res/themestyle/arclist.bin",   // 弧形列表
+            "/user/res/themestyle/hexagons.bin",  // 蜂窝
+            "/user/res/themestyle/dialplate.bin", // 拨号盘
+            "/user/res/themestyle/grid.bin",      // 瀑布流
+    };
+}
+
+#endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp
index bde712f..f7b1c65 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-26 18:14:24
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2025-11-05 15:07:36
+ * @LastEditTime: 2025-11-05 15:11:19
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -726,11 +726,6 @@ namespace OHOS
                 }
             }
         }
-        /*4g开关的状态刷新*/
-        if (DropDownCardPage1::GetInstance())
-        {
-            DropDownCardPage1::GetInstance()->Refresh4GState();
-        }
         #endif
     }
     // 更新信号强度显示
@@ -1026,7 +1021,7 @@ namespace OHOS
         dropDownswipeViewList->SetAnimatorTime(200);           // 200:animator drag time(ms)
         dropDownswipeViewList->SetDraggable(true);
         dropDownswipeViewList->SetTouchable(true);
-        for (uint16_t i = 0; i < 2; i++)
+        for (uint16_t i = 0; i < 1; i++)
         {
             recordCard[i] = CreatePage(i);
             if (nullptr == recordCard[i])

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage1.cpp
index 8f6e926..a4f38b4 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage1.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage1.cpp
@@ -15,6 +15,8 @@
 #include <custom_runtime.h>
 #include <custom_utils.h>
 #include "ConfigModel.h"
+#include "main/include/dropdown/DropDownCardPageUiConfig.h"
+#include "themestyle/include/ThemeStyleModel.h"
 
 extern "C"
 {
@@ -32,36 +34,6 @@ extern "C"
 
 namespace OHOS
 {
-    // viewId
-    static constexpr const char *DROPDOWN_BT_TOGGLEBUTTON_VIEWID = "dropdown_bt";                   // 蓝牙
-    static constexpr const char *DROPDOWN_4G_TOGGLEBUTTON_VIEWID = "dropdown_4g";                   // 4g
-    static constexpr const char *DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID = "dropdown_ALIPAY";           // 支付宝
-    static constexpr const char *DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID = "dropdown_savepower";     // 省电模式
-    static constexpr const char *DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID = "dropdown_sleep";             // 睡眠模式
-    static constexpr const char *DROPDOWN_DNOTDISTURB_TOGGLEBUTTON_VIEWID = "dropdown_dnotdisturb"; // 勿扰模式
-    static constexpr const char *DROPDOWN_SETTING_TOGGLEBUTTON_VIEWID = "dropdown_setting";         // 设置
-
-    // Image src
-    static constexpr const char *DROPDOWN_BT_CONNECT_IMAGE = "/user/res/dropdown/DROPDOWN_BT_CONNECT.bin";
-    static constexpr const char *DROPDOWN_BT_DISCONNECT_IMAGE = "/user/res/dropdown/DROPDOWN_BT_DISCONNECT.bin";
-    static constexpr const char *DROPDOWN_BT_IMAGE = "/user/res/dropdown/DROPDOWN_BT.bin";
-
-    static constexpr const char *DROPDOWN_4G_ON_IMAGE = "/user/res/dropdown/DROPDOWN_4G_ON.bin";
-    static constexpr const char *DROPDOWN_4G_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_4G_OFF.bin";
-
-    static constexpr const char *DROPDOWN_ALIPAY_IMAGE = "/user/res/dropdown/DROPDOWN_ALIPAY.bin";
-
-    static constexpr const char *DROPDOWN_SAVEPOWER_ON_IMAGE = "/user/res/dropdown/DROPDOWN_SAVEPOWER_ON.bin";
-    static constexpr const char *DROPDOWN_SAVEPOWER_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_SAVEPOWER_OFF.bin";
-
-    static constexpr const char *DROPDOWN_SLEEP_ON_IMAGE = "/user/res/dropdown/DROPDOWN_SLEEP_ON.bin";
-    static constexpr const char *DROPDOWN_SLEEP_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_SLEEP_OFF.bin";
-
-    static constexpr const char *DROPDOWN_DNOTDISTURB_ON_IMAGE = "/user/res/dropdown/DROPDOWN_DNOTDISTURB_ON.bin";
-    static constexpr const char *DROPDOWN_DNOTDISTURB_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_DNOTDISTURB_OFF.bin";
-
-    static constexpr const char *DROPDOWN_SETTING_IMAGE = "/user/res/dropdown/DROPDOWN_SETTING.bin";
-
     static DropDownCardPage1 *g_pDropDownCardPage1{nullptr};
     DropDownCardPage1::DropDownCardPage1()
     {
@@ -91,34 +63,13 @@ namespace OHOS
         {
             NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH);
         }
-        else if (viewId == DROPDOWN_4G_TOGGLEBUTTON_VIEWID) // 4G开关
+        else if (viewId == DROPDOWN_FINDPHONE_TOGGLEBUTTON_VIEWID)
         {
-            if (ConfigModel::GetInstance()->GetCat1_4Gability() == false)
-            {
-                NativeAbility::GetInstance().EnterSlice(VIEW_NETWORKANDCALL);
-            }
-            else
-            {
-#if defined(A5133_DEMO_CLIENT) || defined(A5133_DEMO_SERVER)
-                uapi_set4GCapability(true);
-#else
-                uapi_set4GCapability(false);
-#endif
-                state = toggleButton[DropDownCardPage1::toggleButton_4G]->GetState();
-
-                Updat4GState(cat1_api_is_cat1_enabled());
-                ConfigModel::GetInstance()->SetCat1_4Gability(cat1_api_is_cat1_enabled());
-            }
+            NativeAbility::GetInstance().EnterSlice(VIEW_FIND_PHONE);
         }
-        else if (viewId == DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID) // 支付宝
+        else if (viewId == DROPDOWN_APPLIST_DISPLAY_TOGGLEBUTTON_VIEWID)
         {
-#ifdef SUPPORT_ALIPAY_SEC
-            if (Alipay_is_init() == false)
-            {
-                return false;
-            }
-            NativeAbility::GetInstance().EnterSlice(VIEW_MAIN_ALIPAY);
-#endif
+            SetApplistDisplay();
         }
         else if (viewId == DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID) // 省电模式开关
         {
@@ -183,8 +134,17 @@ namespace OHOS
         }
         toggleButton->SetPosition(toggleButtonConfig.left, toggleButtonConfig.top, toggleButtonConfig.width, toggleButtonConfig.height);
         toggleButton->SetViewId(toggleButtonConfig.viewId);
-        toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
-        toggleButton->SetStyle(STYLE_BORDER_RADIUS, 200);
+        if (toggleButtonConfig.viewId == DROPDOWN_APPLIST_DISPLAY_TOGGLEBUTTON_VIEWID)
+        {
+            toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+            toggleButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
+            toggleButton->SetStyle(STYLE_BORDER_RADIUS, 200);
+        }
+        else
+        {
+            toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
+            toggleButton->SetStyle(STYLE_BORDER_RADIUS, 200);
+        }
         toggleButton->SetImages(toggleButtonConfig.selectImg, toggleButtonConfig.unselectImg);
         toggleButton->SetState(toggleButtonConfig.state);
 
@@ -193,21 +153,76 @@ namespace OHOS
         return toggleButton;
     }
 
+    void DropDownCardPage1::SetApplistDisplay(void)
+    {
+        ThemeStyle style = ThemeStyleModel::GetInstance().GetAppListDisplayStyle();
+        if (style == ThemeStyle::APPLIST_STYLE)
+        {
+            toggleButton[2]->SetImages(DROPDOWN_APPLIST_DISPLAY_IMAGE[1], DROPDOWN_APPLIST_DISPLAY_IMAGE[1]); // 切换到弧形列表
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::ARC_SCALE_LIST_STYLE);
+        }
+        else if (style == ThemeStyle::ARC_SCALE_LIST_STYLE)
+        {
+            toggleButton[2]->SetImages(DROPDOWN_APPLIST_DISPLAY_IMAGE[2], DROPDOWN_APPLIST_DISPLAY_IMAGE[2]);// 切换到蜂窝
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::HEXAGONS_STYLE);
+        }
+        else if (style == ThemeStyle::HEXAGONS_STYLE)
+        {
+            toggleButton[2]->SetImages(DROPDOWN_APPLIST_DISPLAY_IMAGE[3], DROPDOWN_APPLIST_DISPLAY_IMAGE[3]); // 切换到拨号盘
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::CIRCLE_LIST_STYLE);
+        }
+        else if (style == ThemeStyle::CIRCLE_LIST_STYLE)
+        {
+            toggleButton[2]->SetImages(DROPDOWN_APPLIST_DISPLAY_IMAGE[4], DROPDOWN_APPLIST_DISPLAY_IMAGE[4]); // 切换到瀑布流
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::WATERFALL_STYLE);
+        }
+        else if (style == ThemeStyle::WATERFALL_STYLE)
+        {
+            toggleButton[2]->SetImages(DROPDOWN_APPLIST_DISPLAY_IMAGE[0], DROPDOWN_APPLIST_DISPLAY_IMAGE[0]); // 切换到列表
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::APPLIST_STYLE);
+        }
+        
+        return;
+    }
+
     bool DropDownCardPage1::InitPage(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitPage");
 
-        bool state_bt = ConfigModel::GetInstance()->GetClassicBlueToothState(); // 传统蓝牙开关
-        bool state_4g = cat1_api_is_cat1_enabled();
-        bool state_savepower = uapi_dev_runtime_get_saveele_status();
+        // 省电模式开关
+        bool state_savepower = uapi_dev_runtime_get_saveele_status(); 
+        // 睡眠模式开关
         bool state_sleep = uapi_sleep_mode_flag_get();
+        // 勿扰模式开关
         bool state_dnotdisturb = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled();
 
+        ThemeStyle style = ThemeStyleModel::GetInstance().GetAppListDisplayStyle();
+        int index = 0;
+        if (style == ThemeStyle::APPLIST_STYLE) // 列表
+        {
+            index = 0;
+        }
+        else if (style == ThemeStyle::ARC_SCALE_LIST_STYLE) // 弧形列表
+        {
+            index = 1;
+        }
+        else if (style == ThemeStyle::HEXAGONS_STYLE) // 蜂窝
+        {
+            index = 2;
+        }
+        else if (style == ThemeStyle::CIRCLE_LIST_STYLE) // 拨号盘
+        {
+            index = 3;
+        }
+        else if (style == ThemeStyle::WATERFALL_STYLE) // 瀑布流
+        {
+            index = 4;
+        }
+
         ToggleButtonConfig toggleButtonConfig[] = {
-            // {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, true, state_bt},
-            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_IMAGE, DROPDOWN_BT_IMAGE, true, state_bt},
-            {110, 0, 100, 100, DROPDOWN_4G_TOGGLEBUTTON_VIEWID, state_4g ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE, state_4g ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE, true, state_4g},
-            {220, 0, 100, 100, DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID, DROPDOWN_ALIPAY_IMAGE, DROPDOWN_ALIPAY_IMAGE, true, true},
+            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_IMAGE, DROPDOWN_BT_IMAGE, true, true},
+            {110, 0, 100, 100, DROPDOWN_FINDPHONE_TOGGLEBUTTON_VIEWID, DROPDOWN_FINDPHONE_IMAGE, DROPDOWN_FINDPHONE_IMAGE, true},
+            {220, 0, 100, 100, DROPDOWN_APPLIST_DISPLAY_TOGGLEBUTTON_VIEWID, DROPDOWN_APPLIST_DISPLAY_IMAGE[index], DROPDOWN_APPLIST_DISPLAY_IMAGE[index], true},
             {330, 0, 100, 100, DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, true, state_savepower},
             {55, 100, 100, 100, DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, true, state_sleep},
             {165, 100, 100, 100, DROPDOWN_DNOTDISTURB_TOGGLEBUTTON_VIEWID, state_dnotdisturb ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE, state_dnotdisturb ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE, true, state_dnotdisturb},
@@ -247,30 +262,6 @@ namespace OHOS
         return toggleButton[index];
     }
 
-    void DropDownCardPage1::UpdateBTState(bool state)
-    {
-        if (toggleButton[DropDownCardPage1::toggleButton_BT] != nullptr)
-        {
-            const char *ImageSrc = state ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE;
-            toggleButton[DropDownCardPage1::toggleButton_BT]->SetImages(ImageSrc, ImageSrc);
-        }
-    }
-
-    void DropDownCardPage1::Updat4GState(bool state)
-    {
-        if (toggleButton[DropDownCardPage1::toggleButton_4G] != nullptr)
-        {
-            const char *ImageSrc = state ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE;
-            toggleButton[DropDownCardPage1::toggleButton_4G]->SetImages(ImageSrc, ImageSrc);
-        }
-    }
-
-    // 刷新4g开关显示
-    void DropDownCardPage1::Refresh4GState()
-    {
-        Updat4GState(cat1_api_is_cat1_enabled());
-    }
-
     void DropDownCardPage1::UpdateDnotdisturbState(bool state)
     {
         if (toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB] != nullptr)
@@ -289,11 +280,5 @@ namespace OHOS
             const char *ImageSrc = state ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE;
             toggleButton[DropDownCardPage1::toggleButton_SLEEP]->SetImages(ImageSrc, ImageSrc);
         }
-        // //勿扰icon
-        // if (toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB] != nullptr)
-        // {
-        //     const char *ImageSrc = state ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE;
-        //     toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->SetImages(ImageSrc, ImageSrc);
-        // }
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage2.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage2.cpp
index c8db8de..350bccd 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage2.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dropdown/DropDownCardPage2.cpp
@@ -12,27 +12,9 @@
 #include "AppViewIDs.h"
 #include "NativeAbility.h"
 #include "themestyle/include/ThemeStyleModel.h"
+#include "main/include/dropdown/DropDownCardPageUiConfig.h"
 namespace OHOS
 {
-    // viewId
-    static constexpr const char *DROPDOWN_FINDPHONE_TOGGLEBUTTON_VIEWID = "dropdown_bt";                    // 查找手机
-    static constexpr const char *DROPDOWN_LIGHTING_TOGGLEBUTTON_VIEWID = "dropdown_4g";                     // 手电筒
-    static constexpr const char *DROPDOWN_APPLIST_DISPLAY_TOGGLEBUTTON_VIEWID = "dropdown_applist_display"; // 列表样式
-
-    // Image src
-    static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_FINDPHONE.bin";
-
-    static constexpr const char *DROPDOWN_LIGHTING_IMAGE = "/user/res/dropdown/DROPDOWN_LIGHTING.bin";
-
-    static constexpr const char *DROPDOWN_APPLIST_DISPLAY_IMAGE[] =
-        {
-            "/user/res/themestyle/list.bin",      // 列表
-            "/user/res/themestyle/arclist.bin",   // 弧形列表
-            "/user/res/themestyle/hexagons.bin",  // 蜂窝
-            "/user/res/themestyle/dialplate.bin", // 拨号盘
-            "/user/res/themestyle/grid.bin",      // 瀑布流
-    };
-
     static DropDownCardPage2 *g_pDropDownCardPage2{nullptr};
     DropDownCardPage2::DropDownCardPage2()
     {