解决手动测试用例不能进入bug

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/AppItemView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/AppItemView.cpp
index 87b35c5..f35dbf0 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/AppItemView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/AppItemView.cpp
@@ -57,7 +57,12 @@ namespace OHOS {
     {
         itemInfo_ = itemInfo;
         icon_.SetSrc(itemInfo.iconSmall);
-        label_.SetTextId(itemInfo_.TextId);
+        if(VIEW_EXTERN_APP != itemInfo.id) {
+            label_.SetTextId(itemInfo.TextId);
+        } else {
+            // printf("ArcScaleListItemView::SetItemInfo:%s\r\n",itemInfo.label);
+            label_.SetText(itemInfo.label);
+        }
     }
 
     AppViewId AppItemView::GetViewId()

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/ApplistModel.cpp
index eb0a839..72356f6 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/applist/src/ApplistModel.cpp
@@ -94,17 +94,24 @@ namespace OHOS {
                 len = APP_MAX_NUM - nativeAppNumTotal;
             }
             while (len--) {
-                applist[appLen] = {
-                    VIEW_EXTERN_APP,
-                    bundleInfos[len].smallIconPath,
-                    bundleInfos[len].bigIconPath,
-                    bundleInfos[len].label,
-                    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);
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems bigIconPath is %s \r", bundleInfos[len].bigIconPath);
+                // applist[appLen] = {
+                //     VIEW_EXTERN_APP,
+                //     bundleInfos[len].smallIconPath,
+                //     bundleInfos[len].bigIconPath,
+                //     bundleInfos[len].label,
+                //     bundleInfos[len].bundleName
+                // };
+                applist[appLen].id = VIEW_EXTERN_APP;
+                applist[appLen].iconLarge = bundleInfos[len].smallIconPath;
+                applist[appLen].iconSmall = bundleInfos[len].smallIconPath;
+                applist[appLen].iconHexagon = bundleInfos[len].bigIconPath;
+                applist[appLen].label = bundleInfos[len].label;
+                applist[appLen].uid = bundleInfos[len].bundleName;
+
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems bundleName is %s \r", bundleInfos[len].bundleName);
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems label is %s \r", bundleInfos[len].label);
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems smallIconPath is %s \r", bundleInfos[len].smallIconPath);
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems bigIconPath is %s \r", bundleInfos[len].bigIconPath);
                 appLen++;
                 bundleInfos[len].abilityInfo = nullptr;
             }

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 f31ac5a..80a6666 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
@@ -74,7 +74,9 @@ namespace OHOS
              shutdown_reboot_prejobs(REBOOT_TYPE);
             break;
         case 2:
-            do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);
+            // do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);
+            shutdown_reboot_prejobs(REBOOT_TYPE);
+            // uapi_restore_factory_setting();
             break;
         case 3:
 #ifdef SUPPORT_BLE_SERVICE