From: Caisking Date: Tue, 24 Jun 2025 09:50:37 +0000 (+0800) Subject: 增加applist进入健康类应用的网络判断 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8b2638476b19d51ef2f8425b45b51cfc2a1ea0fc;p=mirrors%2FFD230.git 增加applist进入健康类应用的网络判断 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 660f9205a..c01a77fc9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -69,13 +69,13 @@ namespace OHOS // #endif #if defined(BOARD_W9) || defined(BOARD_N9) //ECG - //{VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr}, + {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr}, //情绪 - // {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr}, + {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr}, //压力 - //{VIEW_PRESSURE, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_STRESS, nullptr}, + {VIEW_PRESSURE, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_PRESSURE, nullptr}, //疲劳度 - {VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_BP_CHECK, nullptr}, + {VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_FATIGUE_LEVEL, nullptr}, #endif {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr}, {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr}, diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp index 88ebd24a9..1cc82782d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp @@ -17,6 +17,7 @@ #include "heart_blood/health_service/health_service.h" #include "battery_hal.h" #include "ConfigModelC.h" +#include "bleService.h" #include "../../../../../../../drivers/peripheral/utils/custom_runtime.h" namespace OHOS @@ -186,11 +187,21 @@ namespace OHOS HealthService::GetInstance()->SetHealthCurrent(highHealthState); viewId = VIEW_CHECK_INVALID; } - if(uapi_sleep_mode_flag_get()) +#if defined(BOARD_W9) || defined(BOARD_N9) + bool isbleconnected = get_ble_connect(); // 获取蓝牙连接状态 + bool is4Gconnected = uapi_dev_runtime_get_cat1_networkstat(); // 获取4G连接状态 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"isbleconnected = %d is4Gconnected = %d",isbleconnected,is4Gconnected); + if(viewId == VIEW_PRESSURE || viewId == VIEW_EMOTION || viewId == VIEW_ECG + || viewId == VIEW_FATIGUE || viewId == VIEW_BLOOD_PRESSURE_CHECK + || viewId == VIEW_BLOOD_PRESSURE_CALIBRATION) { - if(VIEW_DNOTDISTURB == viewId) - return false; + // 必须至少有一个状态成功才可以正常进入应用,否则进入未连接界面。 + if (isbleconnected == false && is4Gconnected == false) + { + viewId = VIEW_UNCONNECTED; + } } +#endif NativeAbility::GetInstance().EnterSlice(viewId, type); return true; }