From: Caisking <3449750381@qq.com>
Date: Thu, 18 Jan 2024 10:13:26 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1361^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5865e5b37061ce8d9457c22aa51ea1e60a197719;p=mirrors%2FFD230.git

Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin
---

5865e5b37061ce8d9457c22aa51ea1e60a197719
diff --cc code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp
index 00a766acd,920ebd2ec..5ed0a4a8f
--- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp
@@@ -21,107 -21,101 +21,108 @@@
  #include <iostream>
  #include <map>
  
 -namespace OHOS {
 +namespace OHOS
 +{
  
-     map<string, AppViewId> g_jumpView = {
-         {MAIN_CLICK_WEATHER, VIEW_MAIN_SAMPLE},    // 天气界面
-         {MAIN_CLICK_ACTIVITY, VIEW_MAIN_ACTIVITY}, // 活动记录界面
-         {MAIN_CLICK_MESSAGE, VIEW_MAIN_SAMPLE},    // 消息app
-         {MAIN_CLICK_HEARTRATE, VIEW_MAIN_SAMPLE},  // 心率界面
-     };
+ map<string, AppViewId> g_jumpView = { { MAIN_CLICK_WEATHER, VIEW_MAIN_SAMPLE },            // 天气界面
+                                       { MAIN_CLICK_ACTIVITY, VIEW_MAIN_ACTIVITY },         // 活动记录界面
+                                       { MAIN_CLICK_MESSAGE, VIEW_MAIN_SAMPLE },            // 消息app
+                                       { MAIN_CLICK_HEARTRATE, VIEW_MAIN_SAMPLE },          // 心率界面
+                                       { DROPDOWN_CLICK_SETTING,VIEW_SETTING},              // 设置
+                                       { DROPDOWN_CLICK_BLUETOOTH,VIEW_BLUETOOTH_EARPHONE}, // 蓝牙
+                                       };
  
 -// map<string, int> g_chanColor = {         { DROPDOWN_CLICK_FINDMYPHONE, DROPDOWN_DROPDOWN_FIND_PHONE_B },
 -//                                          { DROPDOWN_CLICK_APPLIST, DROPDOWN_DROPDOWN_FIND_PHONE_B},
 -//                                          { DROPDOWN_CLICK_ALARM, DROPDOWN_DROPDOWN_ALARM_B },
 -//                                          { DROPDOWN_CLICK_SETTING, DROPDOWN_DROPDOWN_SETTING_B } };
 +    // map<string, int> g_chanColor = {         { DROPDOWN_CLICK_FINDMYPHONE, DROPDOWN_DROPDOWN_FIND_PHONE_B },
 +    //                                          { DROPDOWN_CLICK_APPLIST, DROPDOWN_DROPDOWN_FIND_PHONE_B},
 +    //                                          { DROPDOWN_CLICK_ALARM, DROPDOWN_DROPDOWN_ALARM_B },
 +    //                                          { DROPDOWN_CLICK_SETTING, DROPDOWN_DROPDOWN_SETTING_B } };
  
 -static MainPresenterSample *g_pMainPresenterSample = nullptr;
 +    static MainPresenterSample *g_pMainPresenterSample = nullptr;
  
 -static constexpr uint16_t DROP_X_MAX = 360;
 -static constexpr uint16_t PROGRESS_PERCENTAGE = 100;
 -static constexpr uint16_t PROGRESS_COUNTDOWN = 20;
 -static constexpr uint16_t HORIZONTAL_SWIPE = 1;
 +    static constexpr uint16_t DROP_X_MAX = 360;
 +    static constexpr uint16_t PROGRESS_PERCENTAGE = 100;
 +    static constexpr uint16_t PROGRESS_COUNTDOWN = 20;
 +    static constexpr uint16_t HORIZONTAL_SWIPE = 1;
  
 -MainPresenterSample::MainPresenterSample()
 -{
 -    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainPresenterSample :%p", this);
 -    g_pMainPresenterSample = this;
 -}
 +    MainPresenterSample::MainPresenterSample()
 +    {
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainPresenterSample :%p", this);
 +        g_pMainPresenterSample = this;
 +    }
  
 -MainPresenterSample::~MainPresenterSample()
 -{
 -    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample");
 -}
 +    MainPresenterSample::~MainPresenterSample()
 +    {
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample");
 +    }
  
 -MainPresenterSample *MainPresenterSample::GetInstance(void)
 -{
 -    return g_pMainPresenterSample;
 -}
 +    MainPresenterSample *MainPresenterSample::GetInstance(void)
 +    {
 +        return g_pMainPresenterSample;
 +    }
  
 -void MainPresenterSample::OnStart()
 -{
 -    Presenter<MainViewSample>::OnStart();
 -    if (keyActListenr == nullptr) {
 -        keyActListenr = new KeyInputListener();
 -        if (keyActListenr != nullptr) {
 -            RootView::GetInstance()->SetOnKeyActListener(keyActListenr);
 +    void MainPresenterSample::OnStart()
 +    {
 +        Presenter<MainViewSample>::OnStart();
 +        if (keyActListenr == nullptr)
 +        {
 +            keyActListenr = new KeyInputListener();
 +            if (keyActListenr != nullptr)
 +            {
 +                RootView::GetInstance()->SetOnKeyActListener(keyActListenr);
 +            }
          }
      }
 -}
  
 -void MainPresenterSample::OnPause(void) {}
 +    void MainPresenterSample::OnPause(void) {}
  
 -void MainPresenterSample::OnResume(void) {}
 +    void MainPresenterSample::OnResume(void) {}
  
 -void MainPresenterSample::OnStop(void)
 -{
 -    if (entryTimes == 0) {
 -        CompassModel::GetInstance()->CloseCompassSensor();
 -    }
 -    Presenter<MainViewSample>::OnStop();
 -    RootView::GetInstance()->ClearOnKeyActListener();
 -    if (keyActListenr != nullptr) {
 -        delete keyActListenr;
 -        keyActListenr = nullptr;
 +    void MainPresenterSample::OnStop(void)
 +    {
 +        if (entryTimes == 0)
 +        {
 +            CompassModel::GetInstance()->CloseCompassSensor();
 +        }
 +        Presenter<MainViewSample>::OnStop();
 +        RootView::GetInstance()->ClearOnKeyActListener();
 +        if (keyActListenr != nullptr)
 +        {
 +            delete keyActListenr;
 +            keyActListenr = nullptr;
 +        }
      }
 -}
  
 -bool MainPresenterSample::OnClick(UIView &view, const ClickEvent &event)
 -{
 -    UNUSED(event);
 -    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StatusButtonClickListener: %s", view.GetViewId());
 -    string curViewId = view.GetViewId();
 -
 -    UIImageView *imgView = static_cast<UIImageView *>(&view);
 -    if (HealthModel::GetInstance() == nullptr) {
 -        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "health model nullptr");
 -        return false;
 +    bool MainPresenterSample::OnClick(UIView &view, const ClickEvent &event)
 +    {
 +        UNUSED(event);
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StatusButtonClickListener: %s", view.GetViewId());
 +        string curViewId = view.GetViewId();
 +
 +        UIImageView *imgView = static_cast<UIImageView *>(&view);
 +        if (HealthModel::GetInstance() == nullptr)
 +        {
 +            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "health model nullptr");
 +            return false;
 +        }
 +#if 0
 +    if (curViewId == DROPDOWN_CLICK_DONOTDISTURB) {
 +        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);
 +        } else {
 +            ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN);
 +            HealthModel::GetInstance()->UpdateBriScrStatus(0);
 +        }
      }
 -    // if (curViewId == DROPDOWN_CLICK_DONOTDISTURB) {
 -    //     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);
 -    //     } else {
 -    //         ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, imgView, DROPDOWN_DROPDOWN_BRI_SCREEN);
 -    //         HealthModel::GetInstance()->UpdateBriScrStatus(0);
 -    //     }
 -    // }
  
      if (g_jumpView.count(curViewId) != 0) {
          NativeAbility::GetInstance().ChangeSlice(g_jumpView[curViewId]);