uiimage同步资源 1710/1 1710/head
authorCaisking <Casiking@zhihuishixun.com>
Wed, 26 Mar 2025 07:32:12 +0000 (15:32 +0800)
committerCaisking <Casiking@zhihuishixun.com>
Wed, 26 Mar 2025 07:32:12 +0000 (15:32 +0800)
code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_image.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/src/CompassView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartRateView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/screensetting/src/ScreenModels.cpp

index b8c573a..a5e9064 100644 (file)
-#ifndef UI_RESOURCE_IMAGE_H
-#define UI_RESOURCE_IMAGE_H
-#include <cstdint>
-namespace OHOS {
-    static const int DIR_MASK = 0xfff00000;
-    static const int PNG_MASK = 0x000fffff;
-
-    static const int HEART_HEARTRATECOOR = 0x100001;
-    static const int HEART_HEARTRATE_BOTTOM = 0x100002;
-    static const int HEART_HEARTRATE_TOP = 0x100003;
-    static const int PLAYER_PLAYERSMODEL_RANDOM = 0x200001;
-    static const int PLAYER_INCREASE_BUTTON = 0x200002;
-    static const int PLAYER_PLAYERSMODEL_SEQUENCE = 0x200003;
-    static const int PLAYER_DECREASE_BUTTON = 0x200004;
-    static const int PLAYER_PLAYERSMODEL_LOOP = 0x200005;
-    static const int PLAYER_PLAYER = 0x200006;
-    static const int PLAYER_BACK_GROUND = 0x200007;
-    static const int PLAYER_SOUND_IMAGE = 0x200008;
-    static const int PLAYER_MUTE_BUTTON = 0x200009;
-    static const int PLAYER_OPTIONS_IMAGE = 0x20000a;
-    static const int PLAYER_NEXT_BUTTON = 0x20000b;
-    static const int PLAYER_PLAYERSMODEL_REPEATS = 0x20000c;
-    static const int PLAYER_PLAYERHIGHLIGHT = 0x20000d;
-    static const int PLAYER_PRE_BUTTOW = 0x20000e;
-    static const int CLOCK_HAND24HOUR_IMAGE_PATH = 0x300001;
-    static const int CLOCK_BIGCIRCLE_IMAGE_PATH = 0x300002;
-    static const int CLOCK_PROGRESS_IMAGE_PATH = 0x300003;
-    static const int CLOCK_HOURHAND = 0x300004;
-    static const int CLOCK_MONDAY_IMAGE_PATH = 0x300005;
-    static const int CLOCK_CIRCLE_IMAGE_PATH = 0x300006;
-    static const int CLOCK_SHOE_IMAGE = 0x300007;
-    static const int CLOCK_FIRDAY_IMAGE_PATH = 0x300008;
-    static const int CLOCK_WEDNESDAY_IMAGE_PATH = 0x300009;
-    static const int CLOCK_SUNDAY_IMAGE_PATH = 0x30000a;
-    static const int CLOCK_SATURDAY_IMAGE_PATH = 0x30000b;
-    static const int CLOCK_MINUTEHAND = 0x30000c;
-    static const int CLOCK_MEDCIRCLE_IMAGE_PATH = 0x30000d;
-    static const int CLOCK_HEARTRATE_IMAGE_PATH = 0x30000e;
-    static const int CLOCK_MAIN_FACE_IMAGE = 0x30000f;
-    static const int CLOCK_SMALLCIRCLE_IMAGE_PATH = 0x300010;
-    static const int CLOCK_THURSDAY_IMAGE_PATH = 0x300011;
-    static const int CLOCK_SECONDHAND = 0x300012;
-    static const int CLOCK_TUESDAY_IMAGE_PATH = 0x300013;
-    static const int DROPDOWN_DROPDOWN_BLUETOOTH = 0x400001;
-    static const int DROPDOWN_DROPDOWN_DN_DISTURB = 0x400002;
-    static const int DROPDOWN_DROPDOWN_BLUETOOTH_B = 0x400003;
-    static const int DROPDOWN_DROPDOWN_ALARM = 0x400004;
-    static const int DROPDOWN_DROPDOWN_BRI_SCREEN = 0x400005;
-    static const int DROPDOWN_DROPDOWN_FIND_PHONE_B = 0x400006;
-    static const int DROPDOWN_DROPDOWN_ALARM_B = 0x400007;
-    static const int DROPDOWN_DROPDOWN_SETTING = 0x400008;
-    static const int DROPDOWN_DROPDOWN_DN_DISTURB_B = 0x400009;
-    static const int DROPDOWN_DROPDOWN_FIND_PHONE = 0x40000a;
-    static const int DROPDOWN_DROPDOWN_SETTING_B = 0x40000b;
-    static const int DROPDOWN_DROPDOWN_BATTERY = 0x40000c;
-    static const int DROPDOWN_DROPDOWN_BRI_SCREEN_B = 0x40000d;
-    static const int COMPASS_ROTATE_CENTER_IMAGE = 0x500001;
-    static const int COMPASS_CORRESPONDENCE_DEGREE = 0x500002;
-    static const int COMPASS_COMPASS = 0x500003;
-
-}
-#endif
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-16 14:43:44
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-08-06 16:03:11
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_image.h
+ */
+ #ifndef UI_RESOURCE_IMAGE_H
+ #define UI_RESOURCE_IMAGE_H
+ #include <cstdint>
+ namespace OHOS
+ {
+     static const int DIR_MASK = 0xfff00000;
+     static const int PNG_MASK = 0x000fffff;
+ 
+     static const int HEART_RATE_BOTTOM = 0x100001;
+     static const int HEART_RATE_COOR = 0x100002;
+     static const int HEART_RATE_TOP = 0x100003;
+     /* -------------------------------------------------------------------------- */
+     static const int PLAYER_BACKGROUND = 0x200001;            // 音乐背景
+     static const int PLAYER_BLUETOOTH_COLOR = 0x200002;       // 蓝牙图标蓝色图片
+     static const int PLAYER_BLUETOOTH_GRAY = 0x200003;        // 蓝牙图标灰色图片
+     static const int PLAYER_DECREASE_BUTTON = 0x200004;       // 点击后声音减少
+     static const int PLAYER_DOWM_66 = 0x200005;               // 朝下的66图片
+     static const int PLAYER_EARPHONE = 0x200006;              // 大的蓝牙耳机的icon
+     static const int PLAYER_EARPHONE_COLOR = 0x200007;        // 蓝牙耳机模式绿色图片
+     static const int PLAYER_EARPHONE_WHITE = 0x200008;        // 蓝牙耳机模式白色图片
+     static const int PLAYER_ELLIPSE = 0x200009;               // 绿色椭圆
+     static const int PLAYER_INCREASE_BUTTON = 0x20000a;       // 点击后声音加
+     static const int PLAYER_LOCAL_MUSIC_COLOR = 0x20000b;     // 本地音乐模式绿色图片,默认本地模式
+     static const int PLAYER_LOCAL_MUSIC_WHITE = 0x20000c;     // 本地音乐模式白色图片
+     static const int PLAYER_LOOK_CONNECTED_NOTE = 0x20000d;   // 查看已连接蓝牙耳机提示图标
+     static const int PLAYER_MUSIC_DELETE = 0x20000e;          // 删除音乐
+     static const int PLAYER_MUSIC_LIST = 0x20000f;            // 音乐列表
+     static const int PLAYER_MUSIC_NEXT = 0x200010;            // 下一首音乐
+     static const int PLAYER_MUSIC_PAUSE = 0x200011;           // 播放暂停
+     static const int PLAYER_MUSIC_PLAY = 0x200012;            // 播放音乐
+     static const int PLAYER_MUSIC_PLAYING = 0x200013;         // 播放音乐中
+     static const int PLAYER_MUSIC_PROVE = 0x200014;           // 上一首音乐
+     static const int PLAYER_MUSIC_VOICE = 0x200015;           // 声音
+     static const int PLAYER_MUTE_BUTTON = 0x200016;           // 静音
+     static const int PLAYER_PHONE_COLOR = 0x200017;           // 手机音乐模式绿色图片
+     static const int PLAYER_PHONE_WHITE = 0x200018;           // 手机音乐模式白色图片
+     static const int PLAYER_PLAYERSMODEL_LOOP = 0x200019;     // 播放模式:循环播放
+     static const int PLAYER_PLAYERSMODEL_RANDOM = 0x20001a;   // 播放模式:随机播放
+     static const int PLAYER_PLAYERSMODEL_REPEATS = 0x20001b;  // 播放模式:单曲循环
+     static const int PLAYER_PLAYERSMODEL_SEQUENCE = 0x20001c; // 播放模式: 循序播放
+     static const int PLAYER_PLAYERSMODEL_UNUSABLE = 0x20001d; // 播放模型:不能使用
+     static const int PLAYER_PLAYING_GLARY = 0x20001e;         // 播放音乐中大的灰色图片
+     static const int PLAYER_UP_66 = 0x20001f;                 // 朝上的66图片
+ 
+     /* -------------------------------------------------------------------------- */
+     static const int CLOCK_CLOCK0 = 0x300001;
+     static const int CLOCK_CLOCK1 = 0x300002;
+     static const int CLOCK_CLOCK10 = 0x300003;
+     static const int CLOCK_CLOCK12 = 0x300004;
+     static const int CLOCK_CLOCK13 = 0x300005;
+     static const int CLOCK_CLOCK14 = 0x300006;
+     static const int CLOCK_CLOCK15 = 0x300007;
+     static const int CLOCK_CLOCK16 = 0x300008;
+     static const int CLOCK_CLOCK18 = 0x300009;
+     static const int CLOCK_CLOCK2 = 0x30000a;
+     static const int CLOCK_CLOCK4 = 0x30000b;
+     static const int CLOCK_CLOCK5 = 0x30000c;
+     static const int CLOCK_CLOCK6 = 0x30000d;
+     static const int CLOCK_CLOCK7 = 0x30000e;
+     static const int CLOCK_CLOCK8 = 0x30000f;
+     static const int CLOCK_CLOCK9 = 0x300010;
+     static const int CLOCK_CLASSIC_GEOMETRY = 0x300011;
+     static const int CLOCK_CLOCK_HOUR = 0x300012;
+     static const int CLOCK_CLOCK_MINUTE = 0x300013;
+     static const int CLOCK_CLOCK_SECOND = 0x300014;
+     static const int CLOCK_HOUR = 0x300015;
+     static const int CLOCK_MINUTE = 0x300016;
+     static const int CLOCK_SECOND = 0x300017;
+     /* -------------------------------------------------------------------------- */
+     static const int DROPDOWN_BLUETOOTH = 0x400001;             // 蓝牙
+     static const int DROPDOWN_BLUETOOTHCONNECTED = 0x400002;    // 蓝牙连接中
+     static const int DROPDOWN_BLUETOOTHDISCONNECTED = 0x400003; // 蓝牙未连接
+     static const int DROPDOWN_DNOTDISTURB = 0x400004;           // 勿扰模式
+     static const int DROPDOWN_EARPHONESCONNECTED = 0x400005;    // 耳机连接中
+     static const int DROPDOWN_EARPHONESDISCONNECTED = 0x400006; // 耳机未连接
+     static const int DROPDOWN_FINDPHONE = 0x400007;             // 找手机
+     static const int DROPDOWN_ICONELLIPSEBLACK = 0x400008;      // 图标椭圆黑色
+     static const int DROPDOWN_ICONELLIPSEPURPLE = 0x400009;     // 图标椭圆紫色
+     static const int DROPDOWN_LIGHTING = 0x40000a;              // 亮屏
+     static const int DROPDOWN_LINE = 0x40000b;                  // 线
+     static const int DROPDOWN_NOSIGNAL = 0x40000c;              // 无信号
+     static const int DROPDOWN_PHONECONNECTED = 0x40000d;        // 手机连接中
+     static const int DROPDOWN_PHONEDISCONNECTED = 0x40000e;     // 手机未连接
+     static const int DROPDOWN_SAVEPOWER = 0x40000f;             // 省电模式
+     static const int DROPDOWN_SETTING = 0x400010;               // 设置
+     /* -------------------------------------------------------------------------- */
+     static const int COMPASS_COMPASS0 = 0x500001; // 背景
+     static const int COMPASS_COMPASS1 = 0x500002; // 标记点图片
+     static const int COMPASS_COMPASS2 = 0x500003; // 三角
+     /* -------------------------------------------------------------------------- */
+     static const int BLOODOXYGEN_BACKGOUND = 0x600001;
+     static const int MESSAGE_MESSAGE = 0x700001;
+     static const int MESSAGE_QQ = 0x700002;
+     static const int MESSAGE_SYSTEM = 0x700003;
+     static const int MESSAGE_WECHAT = 0x700004;
+     static const int TRAINING_BOUTTONGROUND = 0x800001;
+     static const int TRAINING_BUTTONGROUND2 = 0x800002;
+     static const int TRAINING_MORE = 0x800003;
+     static const int TRAINING_RIDING_BIG2 = 0x800004;
+     static const int TRAINING_RUNNING_BIG = 0x800005;
+     static const int TRAINING_WALKING_BIG = 0x800006;
+     /* -------------------------------------------------------------------------- */
+ 
+ }
+ #endif
+ 
\ No newline at end of file
index 5b3bbc2..0a87fd1 100644 (file)
@@ -94,7 +94,7 @@ bool CompassView::InitCompassImage(void)
     }
     backGround->SetPosition(0, 0);
 
-    if (!LoadCompassImage(backGround, COMPASS_COMPASS)) {
+    if (!LoadCompassImage(backGround, COMPASS_COMPASS0)) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__);
         return false;
     }
@@ -105,7 +105,7 @@ bool CompassView::InitCompassImage(void)
         return false;
     }
     rotateShaft->SetPosition(POINT_CENTER_IMAGE_X, POINT_CENTER_IMAGE_Y);
-    if (!LoadCompassImage(rotateShaft, COMPASS_ROTATE_CENTER_IMAGE)) {
+    if (!LoadCompassImage(rotateShaft, COMPASS_COMPASS1)) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], rotateShaft load fail", __LINE__);
         return false;
     }
@@ -116,7 +116,7 @@ bool CompassView::InitCompassImage(void)
         return false;
     }
     triangulation->SetPosition(TRIANGULATION_X, TRIANGULATION_Y);
-    if (!LoadCompassImage(triangulation, COMPASS_CORRESPONDENCE_DEGREE)) {
+    if (!LoadCompassImage(triangulation, COMPASS_COMPASS2)) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "triangulation load fail");
         return false;
     }
index 8c96435..32e84d6 100644 (file)
@@ -581,9 +581,9 @@ void HeartRateView::PreLoad(void)
     }\r
 \r
     if (!resLoadStatus) {\r
-        ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewTop, HEART_HEARTRATE_TOP);\r
-        ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewBottom, HEART_HEARTRATE_BOTTOM);\r
-        ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewCoordinate, HEART_HEARTRATECOOR);\r
+        // ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewTop, HEART_HEARTRATE_TOP);\r
+        // ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewBottom, HEART_HEARTRATE_BOTTOM);\r
+        // ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewCoordinate, HEART_HEARTRATECOOR);\r
         resLoadStatus = true;\r
     }\r
 }\r
index 6f3efcd..4eff7a9 100644 (file)
@@ -135,7 +135,7 @@ bool IndoorWalkPreparedView::InitBatteryView() // 加载电量
         return false;\r
     }\r
     battery->SetPosition(BATTERY_X, BATTERY_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
+    // ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
     group->Add(battery);\r
 \r
     batteryLable = new UILabel();\r
index 1b2440b..8ae4a5a 100644 (file)
@@ -288,9 +288,9 @@ int PlayersView::ShowUpCheckBoxButton()
     }
     playerButton->SetPosition(140, 139, 172, 172); // 140:x 139:y 172:width 172:height
     playerButton->SetOnClickListener(playerlistener);
-    image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYER, PLAYER_IAMGES);
-    hlImage = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYERHIGHLIGHT, PLAYER_IAMGES);
-    playerButton->SetImages(hlImage, image);
+    // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYER, PLAYER_IAMGES);
+    // hlImage = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYERHIGHLIGHT, PLAYER_IAMGES);
+    // playerButton->SetImages(hlImage, image);
     Add(playerButton);
 
     soundlistener = new ButtonOnClickListener(reinterpret_cast<UIView*>(soundButton));
@@ -301,10 +301,10 @@ int PlayersView::ShowUpCheckBoxButton()
     soundButton->SetTouchable(true);
     soundButton->SetPosition(178, 316, 95, 76); // 178:x 316:y 95:width 76:height
     soundButton->SetOnClickListener(soundlistener);
-    if (!LoadPlayerImage(soundButton, PLAYER_SOUND_IMAGE)) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail");
-        return false;
-    }
+    // if (!LoadPlayerImage(soundButton, PLAYER_SOUND_IMAGE)) {
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail");
+    //     return false;
+    // }
     Add(soundButton);
     return OHOS_SUCCESS;
 }
@@ -321,8 +321,8 @@ int PlayersView::ShowUpButton()
         return OHOS_FAILURE;
     }
     SetUpButton(nextButton, pointBtn, 93, 116, nextlistener); // 93:width 116:height
-    image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_NEXT_BUTTON, PLAYER_IAMGES);
-    nextButton->SetImageSrc(image, image);
+    // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_NEXT_BUTTON, PLAYER_IAMGES);
+    // nextButton->SetImageSrc(image, image);
     pointBtn.x = 31; // 31:x
     pointBtn.y = 168; // 168:y
     prelistener = new ButtonOnClickListener(reinterpret_cast<UIView*>(preButton));
@@ -331,8 +331,8 @@ int PlayersView::ShowUpButton()
         return OHOS_FAILURE;
     }
     SetUpButton(preButton, pointBtn, 86, 116, prelistener); // 86:width 116:height
-    image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PRE_BUTTOW, PLAYER_IAMGES);
-    preButton->SetImageSrc(image, image);
+    // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PRE_BUTTOW, PLAYER_IAMGES);
+    // preButton->SetImageSrc(image, image);
 
     pointBtn.x = 87; // 87:x
     pointBtn.y = 316; // 316:y
@@ -433,8 +433,8 @@ int PlayersView::ShowUpButtonOptions()
         return OHOS_FAILURE;
     }
     SetUpButton(optionsButton, pointBtn, 75, 76, optionslistener); // 75:width 76:height
-    ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_OPTIONS_IMAGE, PLAYER_IAMGES);
-    optionsButton->SetImageSrc(image, image);
+    // ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_OPTIONS_IMAGE, PLAYER_IAMGES);
+    // optionsButton->SetImageSrc(image, image);
 
     pointBtn.x = 178; // 178:x
     pointBtn.y = 394; // 394:y
@@ -509,10 +509,10 @@ bool PlayersView::InitBackGround(void)
         }
     }
     backGround->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
-    if (!LoadPlayerImage(backGround, PLAYER_BACK_GROUND)) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail");
-        return false;
-    }
+    // if (!LoadPlayerImage(backGround, PLAYER_BACK_GROUND)) {
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail");
+    //     return false;
+    // }
     Add(backGround);
     return true;
 }
index 3a76e14..e93dc6a 100644 (file)
@@ -73,10 +73,10 @@ bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t r
 
 void ScreenModels::PreLoadAppimages(void)
 {
-    LoadAppMultiImages(PLAYER_IAMGES, PLAYER_PLAYERSMODEL_RANDOM, PLAYER_PLAYERHIGHLIGHT);
-    LoadAppMultiImages(CLOCK_IAMGES, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);
-    LoadAppMultiImages(COMPASS_IAMGES, COMPASS_ROTATE_CENTER_IMAGE, COMPASS_COMPASS);
-    LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_DROPDOWN_BLUETOOTH, DROPDOWN_DROPDOWN_BRI_SCREEN_B);
-    LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);
+    // LoadAppMultiImages(PLAYER_IAMGES, PLAYER_PLAYERSMODEL_RANDOM, PLAYER_PLAYERHIGHLIGHT);
+    // LoadAppMultiImages(CLOCK_IAMGES, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);
+    // LoadAppMultiImages(COMPASS_IAMGES, COMPASS_ROTATE_CENTER_IMAGE, COMPASS_COMPASS0);
+    // LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_DROPDOWN_BLUETOOTH, DROPDOWN_DROPDOWN_BRI_SCREEN_B);
+    // LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);
 }
 }