修改下拉视图:
author罗正yun <1732036298@qq.com>
Wed, 17 Jan 2024 08:13:36 +0000 (16:13 +0800)
committer罗正yun <1732036298@qq.com>
Wed, 17 Jan 2024 08:13:36 +0000 (16:13 +0800)
1.点击找手机会快速重启(做测试用的)
2.其他点击暂时关闭点击跳转到其他视图功能
修改天气视图
更新下拉视图图片:dropdown.bin

code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h
code/sdk/application/wearable/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp
code/sdk/application/wearable/nativeapp/nativeui/main/include/MainPresenterSample.h
code/sdk/application/wearable/nativeapp/nativeui/main/include/PullUpDownView.h
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp
code/sdk/application/wearable/nativeapp/nativeui/main/src/PullUpDownView.cpp
code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
code/sdk/application/wearable/nativeapp/nativeui/weather/src/WeatherView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/dropdown/dropdown.bin
code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_clock_dial/PullUpDownView.h

index 20e72a4..62a48f1 100755 (executable)
@@ -55,19 +55,18 @@ namespace OHOS
     static const int CLOCK_SECONDHAND = 0x300012;\r
     static const int CLOCK_TUESDAY_IMAGE_PATH = 0x300013;\r
     /* -------------------------------------------------------------------------- */\r
-    static const int DROPDOWN_DROPDOWN_BLUETOOTH = 0x400001;\r
-    static const int DROPDOWN_DROPDOWN_DN_DISTURB = 0x400002;\r
-    static const int DROPDOWN_DROPDOWN_BLUETOOTH_B = 0x400003;\r
-    static const int DROPDOWN_DROPDOWN_ALARM = 0x400004;\r
-    static const int DROPDOWN_DROPDOWN_BRI_SCREEN = 0x400005;\r
-    static const int DROPDOWN_DROPDOWN_FIND_PHONE_B = 0x400006;\r
-    static const int DROPDOWN_DROPDOWN_ALARM_B = 0x400007;\r
-    static const int DROPDOWN_DROPDOWN_SETTING = 0x400008;\r
-    static const int DROPDOWN_DROPDOWN_DN_DISTURB_B = 0x400009;\r
-    static const int DROPDOWN_DROPDOWN_FIND_PHONE = 0x40000a;\r
-    static const int DROPDOWN_DROPDOWN_SETTING_B = 0x40000b;\r
-    static const int DROPDOWN_DROPDOWN_BATTERY = 0x40000c;\r
-    static const int DROPDOWN_DROPDOWN_BRI_SCREEN_B = 0x40000d;\r
+    static const int DROPDOWN_BLUETOOTHCONNECTED = 0x400001;    // 蓝牙连接中\r
+    static const int DROPDOWN_BLUETOOTHDISCONNECTED = 0x400002; // 蓝牙未连接\r
+    static const int DROPDOWN_EARPHONESCONNECTED = 0x400003;    // 耳机连接中\r
+    static const int DROPDOWN_EARPHONESDISCONNECTED = 0x400004; // 耳机未连接\r
+    static const int DROPDOWN_FINDPHONE = 0x400005;             // 找手机\r
+    static const int DROPDOWN_ICONELLIPSE = 0x400006;           // 图标椭圆\r
+    static const int DROPDOWN_LIGHTING = 0x400007;              // 亮屏\r
+    static const int DROPDOWN_LINE = 0x400008;                  // 线\r
+    static const int DROPDOWN_PHONECONNECTED = 0x400009;        // 手机连接中\r
+    static const int DROPDOWN_PHONEDISCONNECTED = 0x40000a;     // 手机未连接\r
+    static const int DROPDOWN_SAVEPOWER = 0x40000b;             // 省电模式\r
+    static const int DROPDOWN_SETTING = 0x40000c;               // 设置\r
     /* -------------------------------------------------------------------------- */\r
     static const int COMPASS_COMPASS0 = 0x500001;                     // 指南针的背景图片\r
     static const int COMPASS_COMPASS1 = 0x500002;                     // 指南针放置标记点按钮图片\r
index c0d8cf3..9eb916f 100755 (executable)
@@ -129,25 +129,25 @@ IndoorWalkPreparedView *IndoorWalkPreparedView::GetInstance()
 \r
 bool IndoorWalkPreparedView::InitBatteryView() // 加载电量\r
 {\r
-    battery = new UIImageView(); // 电量状态显示\r
-    if (battery == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery new fail");\r
-        return false;\r
-    }\r
-    battery->SetPosition(BATTERY_X, BATTERY_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
-    group->Add(battery);\r
+    // battery = new UIImageView(); // 电量状态显示\r
+    // if (battery == nullptr) {\r
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery new fail");\r
+    //     return false;\r
+    // }\r
+    // battery->SetPosition(BATTERY_X, BATTERY_Y);\r
+    // ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
+    // group->Add(battery);\r
 \r
-    batteryLable = new UILabel();\r
-    if (batteryLable == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "batteryLable new fail");\r
-        return false;\r
-    }\r
-    batteryLable->SetPosition(BATTERY_LABEL_X, BATTERY_LABEL_Y, BATTERY_LABEL_W, BATTERY_LABEL_H);\r
-    batteryLable->SetText("--%");\r
-    batteryLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 30 : font data\r
-    batteryLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-    group->Add(batteryLable);\r
+    // batteryLable = new UILabel();\r
+    // if (batteryLable == nullptr) {\r
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "batteryLable new fail");\r
+    //     return false;\r
+    // }\r
+    // batteryLable->SetPosition(BATTERY_LABEL_X, BATTERY_LABEL_Y, BATTERY_LABEL_W, BATTERY_LABEL_H);\r
+    // batteryLable->SetText("--%");\r
+    // batteryLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 30 : font data\r
+    // batteryLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
+    // group->Add(batteryLable);\r
     return true;\r
 }\r
 \r
index 97bd781..ff47ab6 100755 (executable)
@@ -32,10 +32,14 @@ static constexpr const char *MAIN_CLICK_HEARTRATE = "mainclickheartrate";
 \r
 static constexpr const char *DROPDOWN_CLICK_DONOTDISTURB = "dropdownclickdonotdisturb";\r
 static constexpr const char *DROPDOWN_CLICK_BRIGHTENSCREEN = "dropdownclickbrightscreen";\r
-static constexpr const char *DROPDOWN_CLICK_FINDMYPHONE = "dropdownclickfindmyphone";\r
+\r
 static constexpr const char *DROPDOWN_CLICK_ALARM = "dropdownclickalarm";\r
-static constexpr const char *DROPDOWN_CLICK_SETTING = "dropdownclicksetting";\r
-static constexpr const char *DROPDOWN_CLICK_SAVEELE = "dropdownclicksaveele";\r
+static constexpr const char *DROPDOWN_CLICK_SETTING = "dropdownclicksetting";           //设置\r
+static constexpr const char *DROPDOWN_CLICK_LIGHTING = "dropdownclicklighting";         //亮屏\r
+static constexpr const char *DROPDOWN_CLICK_BLUETOOTH = "dropdownclickbluetooth";       //蓝牙\r
+static constexpr const char *DROPDOWN_CLICK_SAVEELE = "dropdownclicksaveele";           //省电\r
+static constexpr const char *DROPDOWN_CLICK_FINDMYPHONE = "dropdownclickfindmyphone";   //找手机\r
+\r
 constexpr uint16_t VERTICAL_STATUS = 1;\r
 constexpr uint16_t HORIZONTAL_STATUS = 0;\r
 \r
index c601cec..c633422 100755 (executable)
@@ -26,26 +26,22 @@ public:
     void PreLoad(void) override;\r
     void UpdateBlueToothStatus(int status);\r
 private:\r
-    UIImageView *dnotDisturb{nullptr};\r
-    UIImageView *briScreen{nullptr};\r
-    UIImageView *finPhone{nullptr};\r
-    UIImageView *droAlarm{nullptr};\r
-    UIImageView *droSetting{nullptr};\r
-    UILabel *dnotDisturbLable{nullptr};\r
-    UILabel *briScreenLable{nullptr};\r
-    UILabel *finPhoneLable{nullptr};\r
-    UILabel *droAlarmLable{nullptr};\r
-    UILabel *droSettingLable{nullptr};\r
-    UIImageView *bluetooth{nullptr};\r
-    UIImageView *battery{nullptr};\r
-    UILabel *batteryLable{nullptr};\r
-    UILabel *dateLable{nullptr};\r
-    bool viewiInitStatus{false};\r
-    UILabel *timeLable{nullptr};\r
-    void InitSubViewImg(void);\r
+    UIImageView *dropSetting{nullptr};                  //设置\r
+    UIImageView *dropLighting{nullptr};                 //亮屏\r
+    UIImageView *dropBluetooth{nullptr};                //蓝牙\r
+    UIImageView *dropSavePower{nullptr};                //省电\r
+    UIImageView *drofindPhone{nullptr};                 //找手机\r
+    UIImageView *dropIconBackground[5]{nullptr};        //放置各个icon的背景\r
+    UIImageView *showPhoneConnectedStatus{nullptr};     //显示手机连接状态\r
+    UIImageView *showEarPhoneConnectedStatus{nullptr};  //显示耳机连接状态\r
+    UIImageView *showBluetoothConnectedStatus{nullptr}; //显示蓝牙连接状态\r
+    UILabel * showTimeLabel{nullptr};                   //显示时间\r
+    UILabel * showDateLabel{nullptr};                   //显示日期\r
+    UILabel * showWeekLabel{nullptr};                   //显示星期\r
+    void InitViewImgBackGround(void);\r
     void InitViewImg(void);\r
-    void InitViewLable(void);\r
-    void InitViewInfo(void);\r
+    void InitTimeDateWeekLabelAndConnectedStatusImage(void);\r
+    bool viewiInitStatus{false};\r
 \r
     UIView::OnClickListener *clickListener{nullptr};\r
 };\r
index c393ecb..c1d4ff1 100755 (executable)
@@ -20,6 +20,7 @@
 #include "ui_resource_image.h"\r
 #include <iostream>\r
 #include <map>\r
+#include "AppViewIDs.h"\r
 \r
 namespace OHOS\r
 {\r
@@ -32,9 +33,6 @@ namespace OHOS
                                          {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE},    // 省电模式\r
                                          {DROPDOWN_CLICK_SETTING, VIEW_SETTING}};   // 设置界面\r
 \r
-    map<string, int> g_chanColor = {{DROPDOWN_CLICK_FINDMYPHONE, DROPDOWN_DROPDOWN_FIND_PHONE_B},\r
-                                    {DROPDOWN_CLICK_ALARM, DROPDOWN_DROPDOWN_ALARM_B},\r
-                                    {DROPDOWN_CLICK_SETTING, DROPDOWN_DROPDOWN_SETTING_B}};\r
 \r
     static MainPresenterSample *g_pMainPresenterSample = nullptr;\r
 \r
@@ -90,7 +88,11 @@ namespace OHOS
             keyActListenr = nullptr;\r
         }\r
     }\r
-\r
+    extern "C"\r
+    {\r
+        //重启\r
+        uint32_t mcu_os_sys_reset(uint8_t *para, uint32_t para_len); \r
+    }\r
     bool MainPresenterSample::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
         UNUSED(event);\r
@@ -103,37 +105,19 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "health model nullptr");\r
             return false;\r
         }\r
-        if (curViewId == DROPDOWN_CLICK_DONOTDISTURB)\r
-        {\r
-            if (HealthModel::GetInstance()->GetDntDistStatus() == 0)\r
-            {\r
-                ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_DN_DISTURB_B);\r
-                HealthModel::GetInstance()->UpdateDntDistStatus(1);\r
-            }\r
-            else\r
-            {\r
-                ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_DN_DISTURB);\r
-                HealthModel::GetInstance()->UpdateDntDistStatus(0);\r
-            }\r
-        }\r
-        if (curViewId == DROPDOWN_CLICK_BRIGHTENSCREEN)\r
-        {\r
-            if (HealthModel::GetInstance()->GetBriScrStatus() == 0)\r
+        /* ----------------------------- 一下代码是用来将手表快速重启 ----------------------------- */\r
+        #if 1\r
+            if(strcmp(view.GetViewId(),DROPDOWN_CLICK_FINDMYPHONE) == 0)\r
             {\r
-                ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN_B);\r
-                HealthModel::GetInstance()->UpdateBriScrStatus(1);\r
+                mcu_os_sys_reset(NULL,NULL);\r
             }\r
-            else\r
-            {\r
-                ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN);\r
-                HealthModel::GetInstance()->UpdateBriScrStatus(0);\r
-            }\r
-        }\r
-\r
+        #endif\r
+        #if 0\r
         if (g_jumpView.count(curViewId) != 0)\r
         {\r
             NativeAbility::GetInstance().ChangeSlice(g_jumpView[curViewId]);\r
         }\r
+        #endif\r
         return true;\r
     }\r
     bool MainPresenterSample::OnLongPress(UIView& view, const LongPressEvent& event)\r
index 315e6cb..810d473 100755 (executable)
 \r
 namespace OHOS\r
 {\r
-\r
-    static PullUpDownView *g_pPullUpDownView = nullptr;\r
-\r
-    // 勿扰\r
-    constexpr int16_t DISTURB_IMG_X = 186;\r
-    constexpr int16_t DISTURB_IMG_Y = 30;\r
+    /* ---------------------------------- 坐标位置 ---------------------------------- */\r
+    // 设置\r
+    constexpr int16_t SETTING_IMG_X = 30;\r
+    constexpr int16_t SETTING_IMG_Y = 186;\r
 \r
     // 亮屏\r
-    constexpr int16_t SCREEN_IMG_X = 76;\r
-    constexpr int16_t SCREEN_IMG_Y = 76;\r
+    constexpr int16_t LIGHTING_IMG_X = 76;\r
+    constexpr int16_t LIGHTING_IMG_Y = 76;\r
 \r
-    // 找手机\r
-    constexpr int16_t PHONE_IMG_X = 342;\r
-    constexpr int16_t PHONE_IMG_Y = 186;\r
+    // 蓝牙\r
+    constexpr int16_t BLUETOOTH_IMG_X = 186;\r
+    constexpr int16_t BLUETOOTH_IMG_Y = 30;\r
 \r
-    // 闹钟\r
-    constexpr int16_t ALARM_IMG_X = 296;\r
-    constexpr int16_t ALARM_IMG_Y = 76;\r
+    // 省电\r
+    constexpr int16_t SAVEPOWER_IMG_X = 296;\r
+    constexpr int16_t SAVEPOWER_IMG_Y = 76;\r
 \r
-    // 设置\r
-    constexpr int16_t SETTING_IMG_X = 30;\r
-    constexpr int16_t SETTING_IMG_Y = 186;\r
+    // 找手机\r
+    constexpr int16_t FINDPHONE_IMG_X = 342;\r
+    constexpr int16_t FINDPHONE_IMG_Y = 186;\r
 \r
-    constexpr int16_t BLUETOOTH_IMG_X = 145;\r
-    constexpr int16_t BLUETOOTH_IMG_Y = 335;\r
-    constexpr int16_t BATTERY_IMG_X = 195;\r
-    constexpr int16_t BATTERY_IMG_Y = 340;\r
+    // icon图片大小\r
+    constexpr int16_t ICON_IMG_SIZE_W = 94;\r
+    constexpr int16_t ICON_IMG_SIZE_H = 94;\r
 \r
-    constexpr int16_t DISTURB_LABEL_X = 136;\r
-    constexpr int16_t DISTURB_LABEL_Y = 145;\r
-    constexpr int16_t SCREEN_LABEL_X = 270;\r
-    constexpr int16_t SCREEN_LABEL_Y = 145;\r
-    constexpr int16_t PHONE_LABEL_X = 68;\r
-    constexpr int16_t PHONE_LABEL_Y = 279;\r
-    constexpr int16_t ALARM_LABEL_X = 203;\r
-    constexpr int16_t ALARM_LABEL_Y = 279;\r
-    constexpr int16_t SETTING_LABEL_X = 338;\r
-    constexpr int16_t SETTING_LABEL_Y = 279;\r
+    // 电池\r
+    constexpr int16_t BATTERY_X = 209;\r
+    constexpr int16_t BATTERY_Y = 180;\r
 \r
-    constexpr int16_t BATTERY_LABEL_X = 247;\r
-    constexpr int16_t BATTERY_LABEL_Y = 335;\r
+    // 时间\r
+    constexpr int16_t TIME_LABEL_X = 172;\r
+    constexpr int16_t TIME_LABEL_Y = 230;\r
 \r
     // 日期\r
-    constexpr int16_t DATE_LABEL_X = 128;\r
-    constexpr int16_t DATE_LABEL_Y = 299;\r
+    constexpr int16_t DATE_LABEL_X = 130;\r
+    constexpr int16_t DATE_LABEL_Y = 300;\r
 \r
-    constexpr int16_t FONT_DEFAULT_SIZE = 30;\r
-    constexpr int16_t TEXT_WIDTH = 400;\r
-    constexpr int16_t TEXT_HEIGHT = 35;\r
+    // 星期\r
+    constexpr int16_t WEEK_LABEL_X = 265;\r
+    constexpr int16_t WEEK_LABEL_Y = 300;\r
 \r
-constexpr int16_t NONOTICE_LABLE_X = 141;\r
-constexpr int16_t NONOTICE_LABLE_Y = 212;\r
+    // 手机连接状态\r
+    constexpr int16_t PHONECONNECTSTATUS_BUTTON_X = 155;\r
+    constexpr int16_t PHONECONNECTSTATUS_BUTTON_Y = 369;\r
 \r
-PullUpDownView::PullUpDownView()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PullUpDownView");\r
-    g_pPullUpDownView = this;\r
-}\r
+    // 耳机连接状态\r
+    constexpr int16_t EARPHONESCONNECTSTATUS_BUTTON_X = 217;\r
+    constexpr int16_t EARPHONESCONNECTSTATUS_BUTTON_Y = 369;\r
+\r
+    // 蓝牙连接状态\r
+    constexpr int16_t BLUETOOTHCONNECTSTATUS_BUTTON_X = 279;\r
+    constexpr int16_t BLUETOOTHCONNECTSTATUS_BUTTON_Y = 369;\r
+    /* -------------------------------------------------------------------------- */\r
+    static PullUpDownView *g_pPullUpDownView = nullptr;\r
+    PullUpDownView::PullUpDownView()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PullUpDownView");\r
+        g_pPullUpDownView = this;\r
+    }\r
 \r
     PullUpDownView::~PullUpDownView()\r
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::~PullUpDownView");\r
         RemoveAll();\r
-        delete dnotDisturb;\r
-        dnotDisturb = nullptr;\r
-        delete briScreen;\r
-        briScreen = nullptr;\r
-        delete finPhone;\r
-        finPhone = nullptr;\r
-        delete droAlarm;\r
-        droAlarm = nullptr;\r
-        delete droSetting;\r
-        droSetting = nullptr;\r
-        delete dnotDisturbLable;\r
-        dnotDisturbLable = nullptr;\r
-        delete briScreenLable;\r
-        briScreenLable = nullptr;\r
-        delete finPhoneLable;\r
-        finPhoneLable = nullptr;\r
-        delete droAlarmLable;\r
-        droAlarmLable = nullptr;\r
-        delete droSettingLable;\r
-        droSettingLable = nullptr;\r
-        delete bluetooth;\r
-        bluetooth = nullptr;\r
-        delete battery;\r
-        battery = nullptr;\r
-        delete batteryLable;\r
-        batteryLable = nullptr;\r
-        delete dateLable;\r
-        dateLable = nullptr;\r
-        delete timeLable;\r
-        timeLable = nullptr;\r
+        for (int i = 0; i < 5; i++)\r
+        {\r
+            delete dropIconBackground[i];\r
+            dropIconBackground[i] = nullptr;\r
+        }\r
+        delete dropSetting;\r
+        dropSetting = nullptr;\r
+        delete dropLighting;\r
+        dropLighting = nullptr;\r
+        delete dropBluetooth;\r
+        dropBluetooth = nullptr;\r
+        delete dropSavePower;\r
+        dropSavePower = nullptr;\r
+        delete drofindPhone;\r
+        drofindPhone = nullptr;\r
+        delete showTimeLabel;\r
+        showTimeLabel = nullptr;\r
+        delete showDateLabel;\r
+        showDateLabel = nullptr;\r
+        delete showWeekLabel;\r
+        showWeekLabel = nullptr;\r
+        delete showPhoneConnectedStatus;\r
+        showPhoneConnectedStatus = nullptr;\r
+        delete showEarPhoneConnectedStatus;\r
+        showEarPhoneConnectedStatus = nullptr;\r
+        delete showBluetoothConnectedStatus;\r
+        showBluetoothConnectedStatus = nullptr;\r
         g_pPullUpDownView = nullptr;\r
     }\r
 \r
-PullUpDownView *PullUpDownView::GetInstance(void)\r
-{\r
-    return g_pPullUpDownView;\r
-}\r
-\r
-void PullUpDownView::InitSubViewImg(void)\r
-{\r
-    if (HealthModel::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "health model nullptr");\r
-        return;\r
+    PullUpDownView *PullUpDownView::GetInstance(void)\r
+    {\r
+        return g_pPullUpDownView;\r
     }\r
 \r
-        dnotDisturb = new UIImageView();\r
-        if (dnotDisturb == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dnotDisturb new fail");\r
-            return;\r
-        }\r
-        dnotDisturb->SetPosition(DISTURB_IMG_X, DISTURB_IMG_Y);\r
-        if (HealthModel::GetInstance()->GetDntDistStatus() == 0)\r
+    /// @brief 初始化icon图标背景\r
+    /// @param  void\r
+    void PullUpDownView::InitViewImgBackGround(void)\r
+    {\r
+        for (int i = 0; i < 5; i++)\r
         {\r
-            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dnotDisturb, DROPDOWN_DROPDOWN_DN_DISTURB);\r
+            dropIconBackground[i] = new UIImageView();\r
+            if (dropIconBackground[i] == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropIconBackground[%d] new fail", i);\r
+                return;\r
+            }\r
         }\r
-        else\r
+        dropIconBackground[0]->SetPosition(SETTING_IMG_X, SETTING_IMG_Y);\r
+        dropIconBackground[1]->SetPosition(LIGHTING_IMG_X, LIGHTING_IMG_Y);\r
+        dropIconBackground[2]->SetPosition(BLUETOOTH_IMG_X, BLUETOOTH_IMG_Y);\r
+        dropIconBackground[3]->SetPosition(SAVEPOWER_IMG_X, SAVEPOWER_IMG_Y);\r
+        dropIconBackground[4]->SetPosition(FINDPHONE_IMG_X, FINDPHONE_IMG_Y);\r
+        for (int i = 0; i < 5; i++)\r
         {\r
-            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dnotDisturb, DROPDOWN_DROPDOWN_DN_DISTURB_B);\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dropIconBackground[i], DROPDOWN_ICONELLIPSE);\r
+            Add(dropIconBackground[i]);\r
         }\r
-        dnotDisturb->SetViewId(DROPDOWN_CLICK_SAVEELE);\r
-        dnotDisturb->SetTouchable(true);\r
-        dnotDisturb->SetOnClickListener(clickListener); // 进入勿扰模式\r
-\r
-    briScreen = new UIImageView();\r
-    if (briScreen == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "briScreen new fail");\r
-        return;\r
-    }\r
-    briScreen->SetPosition(SCREEN_IMG_X, SCREEN_IMG_Y);\r
-    if (HealthModel::GetInstance()->GetBriScrStatus() == 0) {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, briScreen, DROPDOWN_DROPDOWN_BRI_SCREEN);\r
-    } else {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, briScreen, DROPDOWN_DROPDOWN_BRI_SCREEN_B);\r
-    }\r
-    briScreen->SetViewId(DROPDOWN_CLICK_BRIGHTENSCREEN);\r
-    briScreen->SetTouchable(true);\r
-    briScreen->SetOnClickListener(clickListener); // 进入亮屏模式\r
-}\r
-\r
-void PullUpDownView::InitViewImg(void)\r
-{\r
-    InitSubViewImg();\r
-\r
-    finPhone = new UIImageView();\r
-    if (finPhone == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "finPhone new fail");\r
-        return;\r
     }\r
-    finPhone->SetPosition(PHONE_IMG_X, PHONE_IMG_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, finPhone, DROPDOWN_DROPDOWN_FIND_PHONE);\r
-    finPhone->SetViewId(DROPDOWN_CLICK_FINDMYPHONE); // 找手机界面 DROP_DOWN_FIND_PHONE\r
-    finPhone->SetTouchable(true);\r
-    finPhone->SetOnClickListener(clickListener);\r
 \r
-    droAlarm = new UIImageView();\r
-    if (droAlarm == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "droAlarm new fail");\r
-        return;\r
-    }\r
-    droAlarm->SetPosition(ALARM_IMG_X, ALARM_IMG_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, droAlarm, DROPDOWN_DROPDOWN_ALARM);\r
-    droAlarm->SetViewId(DROPDOWN_CLICK_ALARM); // 进入闹钟App DROP_DOWN_ALARM\r
-    droAlarm->SetTouchable(true);\r
-    droAlarm->SetOnClickListener(clickListener);\r
-\r
-    droSetting = new UIImageView();\r
-    if (droSetting == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "droSetting new fail");\r
-        return;\r
-    }\r
-    droSetting->SetPosition(SETTING_IMG_X, SETTING_IMG_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, droSetting, DROPDOWN_DROPDOWN_SETTING);\r
-    droSetting->SetViewId(DROPDOWN_CLICK_SETTING); // 进入设置界面 DROP_DOWN_SETTING\r
-    droSetting->SetTouchable(true);\r
-    droSetting->SetOnClickListener(clickListener);\r
-}\r
-\r
-    void PullUpDownView::InitViewLable(void)\r
+    /// @brief 初始化icon图标\r
+    /// @param  void\r
+    void PullUpDownView::InitViewImg(void)\r
     {\r
-        dnotDisturbLable = new UILabel();\r
-        if (dnotDisturbLable == nullptr)\r
+        InitViewImgBackGround();\r
+        /* ---------------------------------- 下拉设置图片 ---------------------------------- */\r
+        dropSetting = new UIImageView();\r
+        if (dropSetting == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dnotDisturbLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropSetting new fail");\r
             return;\r
         }\r
-        dnotDisturbLable->SetPosition(DISTURB_LABEL_X, DISTURB_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        // dnotDisturbLable->SetText("勿扰");\r
-        dnotDisturbLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        dnotDisturbLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-\r
-        briScreenLable = new UILabel();\r
-        if (briScreenLable == nullptr)\r
+        dropSetting->SetPosition(SETTING_IMG_X, SETTING_IMG_Y, ICON_IMG_SIZE_W, ICON_IMG_SIZE_H);\r
+        dropSetting->SetAutoEnable(false);\r
+        dropSetting->SetResizeMode(UIImageView::CENTER);\r
+        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dropSetting, DROPDOWN_SETTING);\r
+        dropSetting->SetViewId(DROPDOWN_CLICK_SETTING); // 进入设置界面\r
+        dropSetting->SetTouchable(true);\r
+        dropSetting->SetOnClickListener(clickListener);\r
+        /* ----------------------------------- 亮屏 ----------------------------------- */\r
+        dropLighting = new UIImageView();\r
+        if (dropLighting == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "briScreenLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropLighting new fail");\r
             return;\r
         }\r
-        briScreenLable->SetPosition(SCREEN_LABEL_X, SCREEN_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        // briScreenLable->SetText("亮屏");\r
-        briScreenLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        briScreenLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-        \r
-        finPhoneLable = new UILabel();\r
-        if (finPhoneLable == nullptr)\r
+        dropLighting->SetPosition(LIGHTING_IMG_X, LIGHTING_IMG_Y, ICON_IMG_SIZE_W, ICON_IMG_SIZE_H);\r
+        dropLighting->SetAutoEnable(false);\r
+        dropLighting->SetResizeMode(UIImageView::CENTER);\r
+        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dropLighting, DROPDOWN_LIGHTING);\r
+        dropLighting->SetViewId(DROPDOWN_CLICK_LIGHTING); // 进入亮屏界面\r
+        dropLighting->SetTouchable(true);\r
+        dropLighting->SetOnClickListener(clickListener);\r
+        /* ----------------------------------- 蓝牙 ----------------------------------- */\r
+        dropBluetooth = new UIImageView();\r
+        if (dropBluetooth == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "finPhoneLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropBluetooth new fail");\r
             return;\r
         }\r
-        finPhoneLable->SetPosition(PHONE_LABEL_X, PHONE_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        // finPhoneLable->SetText("找手机");\r
-        finPhoneLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        finPhoneLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-        droAlarmLable = new UILabel();\r
-        if (finPhoneLable == nullptr)\r
+        dropBluetooth->SetPosition(BLUETOOTH_IMG_X, BLUETOOTH_IMG_Y, ICON_IMG_SIZE_W, ICON_IMG_SIZE_H);\r
+        dropBluetooth->SetAutoEnable(false);\r
+        dropBluetooth->SetResizeMode(UIImageView::CENTER);\r
+        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dropBluetooth, DROPDOWN_BLUETOOTHDISCONNECTED);\r
+        dropBluetooth->SetViewId(DROPDOWN_CLICK_BLUETOOTH); // 进入蓝牙界面\r
+        dropBluetooth->SetTouchable(true);\r
+        dropBluetooth->SetOnClickListener(clickListener);\r
+        /* ----------------------------------- 省电 ----------------------------------- */\r
+        dropSavePower = new UIImageView();\r
+        if (dropSavePower == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "finPhoneLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropSavePower new fail");\r
             return;\r
         }\r
-        droAlarmLable->SetPosition(ALARM_LABEL_X, ALARM_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        // droAlarmLable->SetText("闹钟");\r
-        droAlarmLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        droAlarmLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-        droSettingLable = new UILabel();\r
-        if (droSettingLable == nullptr)\r
+        dropSavePower->SetPosition(SAVEPOWER_IMG_X, SAVEPOWER_IMG_Y, ICON_IMG_SIZE_W, ICON_IMG_SIZE_H);\r
+        dropSavePower->SetAutoEnable(false);\r
+        dropSavePower->SetResizeMode(UIImageView::CENTER);\r
+        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, dropSavePower, DROPDOWN_SAVEPOWER);\r
+        dropSavePower->SetViewId(DROPDOWN_CLICK_SAVEELE); // 进入省电界面\r
+        \r
+        dropSavePower->SetTouchable(true);\r
+        dropSavePower->SetOnClickListener(clickListener);\r
+        /* ----------------------------------- 找手机 ---------------------------------- */\r
+        drofindPhone = new UIImageView();\r
+        if (drofindPhone == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "droSettingLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "drofindPhone new fail");\r
             return;\r
         }\r
-        droSettingLable->SetPosition(SETTING_LABEL_X, SETTING_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        // droSettingLable->SetText("设置");\r
-        droSettingLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        droSettingLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-    }\r
-\r
-void PullUpDownView::InitViewInfo(void)\r
-{\r
-    bluetooth = new UIImageView(); // 蓝牙状态显示\r
-    if (bluetooth == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bluetooth new fail");\r
-        return;\r
+        drofindPhone->SetPosition(FINDPHONE_IMG_X, FINDPHONE_IMG_Y, ICON_IMG_SIZE_W, ICON_IMG_SIZE_H);\r
+        drofindPhone->SetAutoEnable(false);\r
+        drofindPhone->SetResizeMode(UIImageView::CENTER);\r
+        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, drofindPhone, DROPDOWN_FINDPHONE);\r
+        drofindPhone->SetViewId(DROPDOWN_CLICK_FINDMYPHONE); // 找手机界面\r
+        drofindPhone->SetTouchable(true);\r
+        drofindPhone->SetOnClickListener(clickListener);\r
+        /* -------------------------------- 添加组件到视图上 -------------------------------- */\r
+        Add(dropSetting);\r
+        Add(dropLighting);\r
+        Add(dropBluetooth);\r
+        Add(dropSavePower);\r
+        Add(drofindPhone);\r
     }\r
-    bluetooth->SetPosition(BLUETOOTH_IMG_X, BLUETOOTH_IMG_Y);\r
-    if (BluetoothModel::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bluetooth model nullptr");\r
-        return;\r
-    }\r
-\r
-    if (SettingModel::GetInstance().GetBlueToothConnectStatus()) {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, bluetooth, DROPDOWN_DROPDOWN_BLUETOOTH_B);\r
-    } else {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, bluetooth, DROPDOWN_DROPDOWN_BLUETOOTH);\r
-    }\r
-\r
-        battery = new UIImageView(); // 电量状态显示\r
-        if (battery == nullptr)\r
+    \r
+    /// @brief 初始化时间,日期,星期标签和连接状态\r
+    /// @param  void\r
+    void PullUpDownView::InitTimeDateWeekLabelAndConnectedStatusImage(void)\r
+    {\r
+        bool ConnectedStatus = false;\r
+        /* -------------------------------- 显示手机连接状态 -------------------------------- */\r
+        showPhoneConnectedStatus = new UIImageView();\r
+        if (showPhoneConnectedStatus == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showPhoneConnectedStatus new fail");\r
             return;\r
         }\r
-        battery->SetPosition(BATTERY_IMG_X, BATTERY_IMG_Y);\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
-        batteryLable = new UILabel();\r
-        if (batteryLable == nullptr)\r
+        showPhoneConnectedStatus->SetPosition(PHONECONNECTSTATUS_BUTTON_X, PHONECONNECTSTATUS_BUTTON_Y);\r
+        if (ConnectedStatus) // 获取手机连接状态\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showPhoneConnectedStatus, DROPDOWN_PHONECONNECTED);\r
+        }\r
+        else\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showPhoneConnectedStatus, DROPDOWN_PHONEDISCONNECTED);\r
+        }\r
+        /* -------------------------------- 显示耳机连接状态 -------------------------------- */\r
+        showEarPhoneConnectedStatus = new UIImageView();\r
+        if (showEarPhoneConnectedStatus == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "batteryLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showEarPhoneConnectedStatus new fail");\r
             return;\r
         }\r
-        batteryLable->SetPosition(BATTERY_LABEL_X, BATTERY_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-        batteryLable->SetText("90%");\r
-        batteryLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        batteryLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-        dateLable = new UILabel();\r
-        if (dateLable == nullptr)\r
+        showEarPhoneConnectedStatus->SetPosition(EARPHONESCONNECTSTATUS_BUTTON_X, EARPHONESCONNECTSTATUS_BUTTON_Y);\r
+        if (ConnectedStatus) // 获取耳机连接状态\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dateLable new fail");\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showEarPhoneConnectedStatus, DROPDOWN_EARPHONESCONNECTED);\r
+        }\r
+        else\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showEarPhoneConnectedStatus, DROPDOWN_EARPHONESDISCONNECTED);\r
+        }\r
+        /* -------------------------------- 显示蓝牙连接状态 -------------------------------- */\r
+        showBluetoothConnectedStatus = new UIImageView();\r
+        if (showBluetoothConnectedStatus == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showBluetoothConnectedStatus new fail");\r
             return;\r
-        }                                                                                    \r
-        dateLable->SetPosition(DATE_LABEL_X, DATE_LABEL_Y, 210, TEXT_HEIGHT); // TEXT_WIDTH = 192\r
-        dateLable->SetText("11月1号 星期三");\r
-        dateLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-        dateLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-\r
-        timeLable = new UILabel();\r
-        if (timeLable == nullptr)\r
+        }\r
+        showBluetoothConnectedStatus->SetPosition(BLUETOOTHCONNECTSTATUS_BUTTON_X, BLUETOOTHCONNECTSTATUS_BUTTON_Y);\r
+        if (BluetoothModel::GetInstance() == nullptr)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "timeLable new fail");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showBluetoothConnectedStatus model nullptr");\r
             return;\r
         }\r
-        timeLable->SetPosition(172,230,500,59); \r
-        timeLable->SetText("23:54");\r
-        timeLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME,50);\r
-        timeLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
+        if (SettingModel::GetInstance().GetBlueToothConnectStatus()) // 获取蓝牙连接状态\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showBluetoothConnectedStatus, DROPDOWN_BLUETOOTHCONNECTED);\r
+        }\r
+        else\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showBluetoothConnectedStatus, DROPDOWN_BLUETOOTHDISCONNECTED);\r
+        }\r
+        /* --------------------------------- 电量状态显示 --------------------------------- */\r
+        \r
+        /* ---------------------------------- 时间显示 ---------------------------------- */\r
+        showTimeLabel = new UILabel();\r
+        if (showTimeLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showTimeLabel new fail");\r
+            return;\r
+        }\r
+        showTimeLabel->SetPosition(TIME_LABEL_X, TIME_LABEL_Y);\r
+        showTimeLabel->SetStyle(STYLE_TEXT_FONT, 50);\r
+        showTimeLabel->SetStyle(STYLE_LINE_HEIGHT, 59);\r
+        showTimeLabel->SetText("23:54");\r
+        showTimeLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+        showTimeLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        showTimeLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 50);\r
+        /* ---------------------------------- 日期显示 ---------------------------------- */\r
+        showDateLabel = new UILabel();\r
+        if (showDateLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showDateLabel new fail");\r
+            return;\r
+        }\r
+        showDateLabel->SetPosition(DATE_LABEL_X, DATE_LABEL_Y);\r
+        showDateLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
+        showDateLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+        showDateLabel->SetText("5月16号");\r
+        showDateLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+        showDateLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        showDateLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        /* ---------------------------------- 星期显示 ---------------------------------- */\r
+        showWeekLabel = new UILabel();\r
+        if (showWeekLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showWeekLabel new fail");\r
+            return;\r
+        }\r
+        showWeekLabel->SetPosition(WEEK_LABEL_X, WEEK_LABEL_Y);\r
+        showWeekLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
+        showWeekLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+        showWeekLabel->SetText("星期一");\r
+        showWeekLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+        showWeekLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        showWeekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        /* -------------------------------- 将组件添加到视图 -------------------------------- */\r
+        //Add(Battery);//电池的\r
+        Add(showTimeLabel);\r
+        Add(showDateLabel);\r
+        Add(showWeekLabel);\r
+        Add(showPhoneConnectedStatus);\r
+        Add(showEarPhoneConnectedStatus);\r
+        Add(showBluetoothConnectedStatus);\r
     }\r
 \r
-    bool PullUpDownView::InitView( )\r
+    bool PullUpDownView::InitView()\r
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::InitDropDownView caller:");\r
         clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance();\r
-\r
         InitViewImg();\r
-        InitViewLable();\r
-        InitViewInfo();\r
-\r
-        Add(dnotDisturb);\r
-        Add(dnotDisturbLable);\r
-        Add(briScreen);\r
-        Add(briScreenLable);\r
-        Add(finPhone);\r
-        Add(finPhoneLable);\r
-        Add(droAlarm);\r
-        Add(droAlarmLable);\r
-        Add(droSetting);\r
-        Add(droSettingLable);\r
-        Add(bluetooth);\r
-        Add(battery);\r
-        Add(batteryLable);\r
-        Add(dateLable);\r
-        Add(timeLable);\r
+        InitTimeDateWeekLabelAndConnectedStatusImage();\r
 \r
-    SetTouchable(true);\r
-    SetIntercept(true);\r
+        SetTouchable(true);\r
+        SetIntercept(true);\r
 \r
-    return true;\r
-}\r
+        return true;\r
+    }\r
 \r
-void PullUpDownView::PreLoad(void)\r
-{\r
-    if (!viewiInitStatus) {\r
-        InitView();\r
-        viewiInitStatus = true;\r
+    void PullUpDownView::PreLoad(void)\r
+    {\r
+        if (!viewiInitStatus)\r
+        {\r
+            InitView();\r
+            viewiInitStatus = true;\r
+        }\r
     }\r
-}\r
 \r
-void PullUpDownView::UpdateBlueToothStatus(int status)\r
-{\r
-    if (bluetooth == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bluetooth nullptr");\r
+    void PullUpDownView::UpdateBlueToothStatus(int status)\r
+    {\r
+        if (showBluetoothConnectedStatus == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showBluetoothConnectedStatus nullptr");\r
+            return;\r
+        }\r
+        if (status == 1)\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showBluetoothConnectedStatus, DROPDOWN_BLUETOOTHCONNECTED);\r
+        }\r
+        else\r
+        {\r
+            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, showBluetoothConnectedStatus, DROPDOWN_BLUETOOTHDISCONNECTED);\r
+        }\r
+        showBluetoothConnectedStatus->Invalidate();\r
         return;\r
     }\r
-    if (status == 1) {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, bluetooth, DROPDOWN_DROPDOWN_BLUETOOTH_B);\r
-    } else {\r
-        ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, bluetooth, DROPDOWN_DROPDOWN_BLUETOOTH);\r
-    }\r
-    bluetooth->Invalidate();\r
-    return;\r
-}\r
 \r
 }\r
index cffb643..91ca347 100755 (executable)
@@ -179,7 +179,7 @@ void ScreenModels::PreLoadAppimages(void)
     //LoadAppMultiImages(DIAL_CLOCK, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);\r
     //LoadAppMultiImages(CLOCK_IAMGES, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);\r
     LoadAppMultiImages(COMPASS_IAMGES, COMPASS_COMPASS0, COMPASS_START_PATH_RECORD);\r
-    LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_DROPDOWN_BLUETOOTH, DROPDOWN_DROPDOWN_BRI_SCREEN_B);\r
+    LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING);\r
     LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);\r
 }\r
 }\r
index b281f28..273ba54 100644 (file)
@@ -80,14 +80,14 @@ namespace OHOS
         srand(time(0));
         std::string area[] = {"23:54", "12:00", "7:25"};
         int num = rand() % (sizeof(area) / sizeof(area[0]));
-        return area[num];
+        return area[1];
     }
 
     // 获取天气图片
     std::string WeatherView::GetWeatherImage()
     {
         int size = sizeof(weather130x130) / sizeof(weather130x130[0]);
-        return weather130x130[rand() % size];
+        return weather130x130[8];
     }
     // 获取温度
 
@@ -96,7 +96,7 @@ namespace OHOS
         // 使用系统时间作为种子
         srand(time(0));
         int temperature = rand() % 50;
-        return std::to_string(temperature) + "°";
+        return std::to_string(22) + "°";
     }
     // 获取天气描述
 
@@ -105,16 +105,16 @@ namespace OHOS
         srand(time(0));
         std::string area[] = {"晴", "雨夹雪", "雷阵雨伴有冰雹"};
         int num = rand() % (sizeof(area) / sizeof(area[0]));
-        return area[num];
+        return area[0];
     }
     // 获取天气地区
 
     std::string WeatherView::GetWeatherArea()
     {
         srand(time(0));
-        std::string area[] = {"北京市东城区", "深圳市福田区"};
+        std::string area[] = {"北京市东城区", "深圳市保安区"};
         int num = rand() % (sizeof(area) / sizeof(area[0]));
-        return area[num];
+        return area[1];
     }
     // 获取最高气温和最低气温
 
@@ -125,7 +125,7 @@ namespace OHOS
         // 生成随机数
         int maxtemperature = 20 + rand() % 40; // 最高气温:20°~60°
         int mintemperature = -5 + rand() % 20;
-        std::string MaxandMinTemperature = "最高" + std::to_string(maxtemperature) + "°" + " " + "最低" + std::to_string(mintemperature) + "°";
+        std::string MaxandMinTemperature = "最高" + std::to_string(22) + "°" + " " + "最低" + std::to_string(18) + "°";
         return MaxandMinTemperature;
     }
 
@@ -179,7 +179,15 @@ namespace OHOS
             return false;
         }
         /* -------------------------------------------------------------------------- */
-        showWeatherDescriptionLabel = InitLabel(111, 264, WeatherDescription.c_str(), "showWeatherDescriptionLabel", 35, 41);
+        UILabel *showWeatherDescriptionLabel = new UILabel();
+        showWeatherDescriptionLabel->SetPosition(83, 264,300,40);
+        showWeatherDescriptionLabel->SetViewId("showWeatherDescriptionLabel");
+        showWeatherDescriptionLabel->SetStyle(STYLE_TEXT_FONT, 35);
+        showWeatherDescriptionLabel->SetStyle(STYLE_LINE_HEIGHT, 41);
+        showWeatherDescriptionLabel->SetText(WeatherDescription.c_str());
+        showWeatherDescriptionLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
+        showWeatherDescriptionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        showWeatherDescriptionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35);
         if (showWeatherDescriptionLabel == nullptr)
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::new showWeatherDescriptionLabel fail!");
index 8e01f51..23826b4 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/dropdown/dropdown.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/dropdown/dropdown.bin differ
index b7b88b3..35a31bf 100755 (executable)
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef PULL_UP_DOWN_VIEW_H
-#define PULL_UP_DOWN_VIEW_H
+#ifndef PULL_UP_DOWN_VIEW_H_
+#define PULL_UP_DOWN_VIEW_H_
 
 #include "AppGroupView.h"
 #include "components/ui_view_group.h"