Merge #2646 into sdk650pathc0423 from refs/changes/2646/head

Code review from 袁清梦

* refs/changes/2646/head: (22 commits squashed)

  -  增加经期开始与结束的列表

  - 增加女性健康算法

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

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

  - 修复运动数据显示不连续

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

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

  - 优化星历下载的UI

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

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

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

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

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

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

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

  -  GPS只支持室外走路 室外跑步 骑行

  - 272.、n9屏蔽息屏表盘功能

  - 272开机动画背景设置为黑色

  - 修改272开机动画logo

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

  - 增加nextday

  - ln release V1.0.1

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2646

diff --git a/autobuild.sh b/autobuild.sh
index fc9a5f4..6ea0b67 100644 (file)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -59,9 +59,9 @@ declare -A PROJECT_VERSIONS=(
     ["w9"]="1.3.107" 
     ["lt22"]="1.3.107"
     ["n9"]="1.3.110"
-    ["ln"]="1.0.0"
-    ["lnppp"]="1.1.0"
-    ["n9ln"]="1.0.0"
+    ["ln"]="1.0.1"
+    ["lnppp"]="1.1.1"
+    ["n9ln"]="1.0.0" 
     
     # 特殊功能版本 
     ["u8m"]="1.3.107"

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp
index ff45122..699bd39 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -403,12 +403,9 @@
  bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) {
    //跑步 走路 骑行需要GPS
    switch (sportId_) {
-   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_INDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_INDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_TREADMILL:
-   case UIResourceTextId::STR_EXERCISE_STROLLMACHINE:
+   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步
+   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路
+   case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行
      return true;
    default:
      return false;

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
index 6e189ca..2b9a8d3 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
@@ -365,7 +365,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req)
     unused(req);
     AlarmClockModel::GetInstance()->NextDayNotify();
     // current_year = 0;
-#if 0
     printf("******nextday is begin******\r\n");
     // 存储nextday执行日志
     start_report_nextday_log_start();
@@ -398,7 +397,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req)
     nextday_clear_popup_windows_log();
 
     printf("******nextday is end******\r\n");
-#endif
 #ifdef SUPPORT_CYWEE_SERVICE
     /* --------------------------------- 每日目标相关 --------------------------------- */
     cywee_reset_history_daily_data(); //清除运动相关数据
@@ -409,7 +407,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req)
         set_Is_show_flag(1,i);
     }
    
-
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESET_DAILY_DATA, NULL);
 
     // SendMsgToUIService(UI_UPDATE_GOAL, 0, nullptr, 0);
@@ -437,7 +434,7 @@ void MsgCenterNotifyONtimeProc(const Topic topic, Request* req)
     cywee_stand_history_save(time->value);
 
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "保存每小时卡路里数据");
-    cywee_calories_history_save(time->value);
+    cywee_calories_history_save(time->value); 
 
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "保存每小时距离数据");
     cywee_distances_history_save(time->value);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
index 5f32cb3..fd5f4c5 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
@@ -154,7 +154,7 @@ namespace OHOS
                 ShutDownImageInfo[i].height = SHUTDOWN_IMAGE_ANIMATOR_VIEW_H;
             }
             shutDownImageAnimatorView->SetPosition(SHUTDOWN_IMAGE_ANIMATOR_VIEW_X, SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y, SHUTDOWN_IMAGE_ANIMATOR_VIEW_W, SHUTDOWN_IMAGE_ANIMATOR_VIEW_H);
-            shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
+            shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);
             shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
             shutDownImageAnimatorView->SetImageAnimatorSrc(ShutDownImageInfo, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100);
             shutDownImageAnimatorView->SetRepeat(false);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
index c661010..ecf6787 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
@@ -42,7 +42,7 @@ namespace OHOS
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
-        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true};
+        // settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true};
         settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
         settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
         settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
index c755e30..699bd39 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -198,7 +198,7 @@
   //    TraingModel::GetInstance()->AnalysisExtraData(cyweeInfo_ext);
   //    delete cyweeInfo_ext; // 释放内存
   //  }
-  //  //训练心率
+   //训练心率
   //  if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) {
   //    uint8_t heart = *((u_int8_t *)(request->data)); // 进行类型转换
   //    TraingModel::GetInstance()->AnalysisHeartData(heart);
@@ -403,12 +403,9 @@
  bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) {
    //跑步 走路 骑行需要GPS
    switch (sportId_) {
-   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_INDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_INDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_TREADMILL:
-   case UIResourceTextId::STR_EXERCISE_STROLLMACHINE:
+   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步
+   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路
+   case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行
      return true;
    default:
      return false;

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp
index c661010..ecf6787 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp
@@ -42,7 +42,7 @@ namespace OHOS
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
-        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true};
+        // settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true};
         settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
         settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
         settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true};

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
index c755e30..699bd39 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -198,7 +198,7 @@
   //    TraingModel::GetInstance()->AnalysisExtraData(cyweeInfo_ext);
   //    delete cyweeInfo_ext; // 释放内存
   //  }
-  //  //训练心率
+   //训练心率
   //  if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) {
   //    uint8_t heart = *((u_int8_t *)(request->data)); // 进行类型转换
   //    TraingModel::GetInstance()->AnalysisHeartData(heart);
@@ -403,12 +403,9 @@
  bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) {
    //跑步 走路 骑行需要GPS
    switch (sportId_) {
-   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_INDOORRUNNING:
-   case UIResourceTextId::STR_EXERCISE_INDOORWALKING:
-   case UIResourceTextId::STR_EXERCISE_TREADMILL:
-   case UIResourceTextId::STR_EXERCISE_STROLLMACHINE:
+   case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步
+   case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路
+   case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行
      return true;
    default:
      return false;

diff --git a/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin b/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin
index 4661987..6291d30 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin and b/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin differ

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
index 1330ed6..8951ab8 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
@@ -292,7 +292,7 @@ extern "C"
         }
 #endif
             ReBootImageAnimatorView->SetPosition(REBOOT_IMAGE_ANIMATOR_VIEW_X, REBOOT_IMAGE_ANIMATOR_VIEW_Y, REBOOT_IMAGE_ANIMATOR_VIEW_W, REBOOT_IMAGE_ANIMATOR_VIEW_H);
-            ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xffffffff);
+            ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xff000000);
             ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff);
             ReBootImageAnimatorView->SetImageAnimatorSrc(ReBootImageInfo, REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100);
 #if defined(LEINIAO)