增加表盘切换的功能列表接口
authorCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 03:07:24 +0000 (11:07 +0800)
committerCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 03:07:24 +0000 (11:07 +0800)
Resource/res/Blood/Error.bin [new file with mode: 0644]
Resource/res/dial.bin [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp

diff --git a/Resource/res/Blood/Error.bin b/Resource/res/Blood/Error.bin
new file mode 100644 (file)
index 0000000..b8120b8
Binary files /dev/null and b/Resource/res/Blood/Error.bin differ
diff --git a/Resource/res/dial.bin b/Resource/res/dial.bin
new file mode 100644 (file)
index 0000000..bf4e839
Binary files /dev/null and b/Resource/res/dial.bin differ
index dc65466..f33932d 100644 (file)
@@ -376,6 +376,7 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_SETTING_IMAGE = APP_RES_PATH "/APPLIST_SETTING.bin"; // 设置
     static constexpr const char *PNG_APPLIST_TEMP_IMAGE = APP_RES_PATH "/TEMP_IMAGE.bin";         // 体温
 
+    static constexpr const char *PNG_APPLIST_DIAL_IMAGE = APP_RES_PATH "/dial.bin";                       // 表盘设置
     static constexpr const char *PNG_APPLIST_SPORT_IMAGE = APP_RES_PATH "/sport.bin";                     // 活动
     static constexpr const char *PNG_APPLIST_HEARTRATE_IMAGE = APP_RES_PATH "/heart rate.bin";            // 心率
     static constexpr const char *PNG_APPLIST_TRAINING_IMAGE = APP_RES_PATH "/training.bin";               // 训练
index 616ca19..6db07b1 100644 (file)
 #include "ApplistModel.h"
 #include "ApplistPresenter.h"
 
-namespace OHOS {
+namespace OHOS
+{
     const AppItem g_nativeAppList[] = {
         {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr},
         {VIEW_BLOODOXY_SAMPLE, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧饱和度", nullptr},
-        {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "设置", nullptr},
+        {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "系统设置", nullptr},
+        {VIEW_DIAL, PNG_APPLIST_DIAL_IMAGE, PNG_APPLIST_DIAL_IMAGE, "表盘设置", nullptr},
         {VIEW_CALLER_SAMPLE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "通话记录", nullptr},
         {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE, "指南针", nullptr},
         {VIEW_OFFLINEVOICE, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_VOCASSIST_IMAGE, "语音助手", nullptr},
@@ -29,7 +31,7 @@ namespace OHOS {
         {VIEW_INDOORWALK, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_WALK_IMAGE, "室内步行", nullptr},
         {VIEW_UISAMPLE, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "示例", nullptr},
         {VIEW_SPORT, PNG_APPLIST_SPORT_IMAGE, PNG_APPLIST_SPORT_IMAGE, "活动", nullptr},
-        {VIEW_GETPIC,PNG_APPLIST_GETPIC_IMAGE,PNG_APPLIST_GETPIC_IMAGE,"拍照",nullptr},   
+        {VIEW_GETPIC, PNG_APPLIST_GETPIC_IMAGE, PNG_APPLIST_GETPIC_IMAGE, "拍照", nullptr},
         {VIEW_BLOOD, PNG_APPLIST_BLOOD_IMAGE, PNG_APPLIST_BLOOD_IMAGE, "血氧监测", nullptr},
         {VIEW_SPORT, PNG_APPLIST_HEARTRATE_IMAGE, PNG_APPLIST_HEARTRATE_IMAGE, "心率", nullptr},
         {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_TRAINING_IMAGE, "训练", nullptr},
@@ -70,12 +72,15 @@ namespace OHOS {
         uint8 i, ret, nativeAppNum;
         int32 len = 0;
 #ifdef JS_ENABLE
-        if (bundleInfos != nullptr) {
-            for (i = 0; i < bundleLen; i++) {
+        if (bundleInfos != nullptr)
+        {
+            for (i = 0; i < bundleLen; i++)
+            {
                 ClearBundleInfo(bundleInfos + i);
             }
 
-            if (bundleInfos != nullptr) {
+            if (bundleInfos != nullptr)
+            {
                 AdapterFree(bundleInfos);
                 bundleInfos = nullptr;
             }
@@ -85,31 +90,35 @@ namespace OHOS {
         appLen = 0;
 
         nativeAppNum = sizeof(g_nativeAppList) / sizeof(AppItem);
-        if (nativeAppNum >= APP_MAX_NUM) {
+        if (nativeAppNum >= APP_MAX_NUM)
+        {
             nativeAppNum = APP_MAX_NUM;
         }
 
         ret = memcpy_s(applist, sizeof(AppItem) * APP_MAX_NUM, g_nativeAppList, sizeof(AppItem) * nativeAppNum);
-        if (ret != EOK) {
+        if (ret != EOK)
+        {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%s] ret = %d, nativeAppNum = %d", __FUNCTION__, ret, nativeAppNum);
             nativeAppNum = 0;
         }
         appLen = nativeAppNum;
 #ifdef JS_ENABLE
         ret = BundleMsClient::GetInstance().GetBundleInfos(0, &bundleInfos, &len);
-        if ((ret == 0) && (len > 0) && (bundleInfos != nullptr)) {
+        if ((ret == 0) && (len > 0) && (bundleInfos != nullptr))
+        {
             bundleLen = len;
-            if (len > APP_MAX_NUM - nativeAppNum) {
+            if (len > APP_MAX_NUM - nativeAppNum)
+            {
                 len = APP_MAX_NUM - nativeAppNum;
             }
-            while (len--) {
+            while (len--)
+            {
                 applist[appLen] = {
                     VIEW_EXTERN_APP,
                     bundleInfos[len].smallIconPath,
                     bundleInfos[len].smallIconPath,
                     bundleInfos[len].label,
-                    bundleInfos[len].bundleName
-                };
+                    bundleInfos[len].bundleName};
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems bundleName is %s \r", bundleInfos[len].bundleName);
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems label is %s \r", bundleInfos[len].label);
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems smallIconPath is %s \r", bundleInfos[len].smallIconPath);
@@ -152,11 +161,13 @@ namespace OHOS {
 
     void ApplistModel::ApplistUpdate(void)
     {
-        if (presenter != nullptr) {
+        if (presenter != nullptr)
+        {
             ResolvingJSAppItems();
             presenter->GetAppListView()->ClearAppItemToList();
             const AppItem *itemInfo = GetApplistItems();
-            for (uint8 i = 0; i < GetAppListNum(); i++) {
+            for (uint8 i = 0; i < GetAppListNum(); i++)
+            {
                 presenter->GetAppListView()->AddAppItemToList(itemInfo[i]);
             }
             presenter->GetAppListView()->GetAppUIList()->RefreshList();