From: 袁清梦 <3449750381@qq.com> Date: Sat, 22 Jun 2024 10:21:05 +0000 (+0000) Subject: Merge #365 into sdk602patch0521 from refs/changes/365/head X-Git-Tag: release_V1.2.70_20241020_135402~960^2~2 X-Git-Url: http://git.snicker.com.cn/js/static/gitweb.css?a=commitdiff_plain;h=daa87fb12e19532a3c1cef758231a6bcc89001b7;p=mirrors%2FFD230.git Merge #365 into sdk602patch0521 from refs/changes/365/head Code review from 袁清梦 * refs/changes/365/head: (9 commits squashed) - 删除单项信息数据 - 优化message部分显示逻辑 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - Merge branches 'sdk602patch0521' and 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - 更新语言文件 - 增加主界面消息列表点击详情 - 同步资源文件 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/365 --- diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp index 5d7d0dae5..e8d5680b4 100644 --- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp +++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp @@ -134,7 +134,7 @@ namespace OHOS button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED); button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED); button->SetVisible(true); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButton is succeed"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButton is succeed"); return true; } /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 880e46803..c7393c32d 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -511,6 +511,7 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageCardView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageLackView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageControlView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageControlPresenter.cpp #遥控拍照 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/takephotos/src/TakephotosPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 8256ed8ee..8703cc28c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -188,7 +188,7 @@ STR_OTHER_TITLE$Other Sport STR_EXERCISE_TITLE$Exercise Sport STR_TRAINING$Training STR_RAPID_TRAINING$Rapid training -STR_SET_GOALS$Set goals > +STR_SET_GOALS$Set goals STR_DURATION$duration STR_DURATION_SETTING$Duration setting STR_MINUTES$minutes @@ -236,6 +236,54 @@ STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree STR_TRAINING_DURATION$Training duration STR_OFF$Off STR_MORE$More +STR_MORE_APP$Check out the APP for more +STR_SAVENOTE$Turning on power-saving mode turns off non-essential Bluetooth connections, as well as features such as sensor monitoring +STR_SAVEBACK$Press and hold the screen for more than 3 seconds or charge to exit the power saving mode +STR_SAVEASK$Enable or not +STR_BLOOD$bloodoxygen +STR_CHECK$detection +STR_CHECKNEW$Just detected +STR_CHECKTIME$Detected XX minutes ago +STR_CHECKLONG$Detected over 1 hour ago +STR_CHECKNO$No detection records available +STR_CHECKNOTE$Wear it snugly and stay still +STR_CHECKON$Detecting +STR_CHECKSTOP$Stop detection +STR_CHECKERROR$Unable to detect results +STR_WAERKEEP$Please ensure the watch is worn and remain still +STR_WEARRE$Perform a retest +STR_WEARREADY$Click the button below when ready +STR_RECHECK$Retest +STR_CHECKEWARN$Blood Oxygen Alert +STR_BLOODSHORT$Current blood oxygen level is below XX% +STR_HEARTNOTE$Please take care of your health +STR_KONW$Got it +STR_EXPLAIN$Explanation +STR_HEARTREST$Resting +STR_HEARTDATA$Heart rate detection result +STR_HEARTTITLE$Heart rate alert +STR_HEARTMAX$Current heart rate is higher than XX +STR_HEARTMIN$Current heart rate is lower than XX +STR_TRAINGNO$no record +STR_TRAINGGO$Go to training$ +STR_MESSAGE$Message Notification +STR_MESSAGENO$No content currently +STR_CLEAN$Clear +STR_CLEANALL$Clear all +STR_SLEEP$Last Night's Sleep +STR_SLEEPHOUR$Hours +STR_SLEEPMGOAL$Goal +STR_REATTIME$Schedule +STR_SLEEPTIME$Bedtime +STR_WALKTIME$Wake-up Time +STR_DISTURB$The watch will enter Do Not Disturb mode in 20 minutes. To turn it off, please go to the Control Center. +STR_DISTURBNOTE$Do Not Disturb mode is enabled, thus the watch won't vibrate or ring. +STR_MORNNING$Good morning +STR_NOW$Current +STR_NAP$Nap (5 minutes)$ +STR_TACK$Please open the app first, go to "Device" - "Camera" +STR_CLICK$click on "Take a Photo +STR_TACKNUM$Number of photos taken: XX STR_HEART_RATE$Heart Rate STR_BLOOD_OXYGEN$Blood Oxygen STR_TRAINING$Training diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt index 0b67237ae..d5e2cce75 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt @@ -187,7 +187,7 @@ STR_BALL_LIST_TITLE$球类运动 STR_OTHER_TITLE$其他运动 STR_EXERCISE_TITLE$健身运动 STR_RAPID_TRAINING$快速训练 -STR_SET_GOALS$设置目标 > +STR_SET_GOALS$设置目标 STR_DURATION$时长 STR_DURATION_SETTING$时长(分钟) STR_CALORIE$卡路里 @@ -252,12 +252,10 @@ STR_HEARTMAX$当前心率值高于XX STR_HEARTMIN$当前心率值低于XX STR_TRAINGNO$无记录 STR_TRAINGGO$去训练 -STR_MESSAGE$通知 +STR_MESSAGE$消息通知 STR_MESSAGENO$暂无内容 -STR_STEP$今日步数 -STR_DIS$里程(KM) -STR_DUR$燃脂时间 -STR_STANDUP$站立次数 +STR_CLEAN$清除 +STR_CLEANALL$全部清除 STR_SLEEP$昨夜睡眠 STR_SLEEPHOUR$小时 STR_SLEEPMGOAL$目标 diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index abb51b624..79683a1b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -189,7 +189,7 @@ - + @@ -237,6 +237,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index f03ceb6d6..dccec19da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -188,7 +188,7 @@ - + @@ -253,12 +253,10 @@ - + - - - - + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index f1028ed8f..55bbff129 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang index 13f845c2b..00e921d5b 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h index 561c4c70b..cf356056c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -251,258 +251,257 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_BLOOD_OXYGEN = 241, - STR_TRAINING_RECORD = 242, - STR_COMPASS = 243, - STR_PHONE = 244, - STR_FAVORITE_CONTACTS = 245, - STR_WEATHER = 246, - STR_ACTIVITY = 247, - STR_WATCH_FACE = 248, - STR_DISPLAY_MODE = 249, - STR_CARD_MANAGEMENT = 250, - STR_MUSIC = 251, - STR_SLEEP = 252, - STR_RECORD = 253, - STR_BREATH_TRAINING = 254, - STR_REMOTE_SHOOTING = 255, - STR_VOICE_ASSISTANT = 256, - STR_ALIPAY = 257, - STR_TIMER = 258, - STR_ALARM = 259, - STR_STOPWATCH = 260, - STR_CALCULATOR = 261, - STR_FIND_PHONE = 262, - STR_BRIGHTNESS_ADJUSTMENT = 263, - STR_SOUND = 264, - STR_BLUETOOTH = 265, - STR_DO_NOT_DISTURB = 266, - STR_MESSAGE_NOTIFICATION = 267, - STR_POWER_SAVE_MODE = 268, - STR_FLASHLIGHT = 269, - STR_SETTINGS = 270, - STR_SCREEN_AND_BRIGHTNESS = 271, - STR_NETWORKANDCALL = 272, - STR_SOUND_AND_VIBRATION = 273, - STR_MOTION_RECOGNITION = 274, - STR_SYSTEM = 275, - STR_SHUTDOWN_AND_RESTART = 276, - STR_SCREEN_ON_DURATION = 277, - STR_RAISE_TO_WAKE = 278, - STR_5_SECONDS = 279, - STR_10_SECONDS = 280, - STR_15_SECONDS = 281, - STR_30_SECONDS = 282, - STR_60_SECONDS = 283, - STR_300_SECONDS = 284, - STR_4G_CAPABILITY = 285, - STR_VOLTE_CALL = 286, - STR_MOBILE_DATA_OPTION = 287, - STR_SYSTEM_UPDATE = 288, - STR_ONLINE_MUSIC = 289, - STR_BLUETOOTH_HEADPHONES = 290, - STR_TRADITIONAL_BLUETOOTH = 291, - STR_AUTO_OFF_BLUETOOTH_NOTE = 292, - STR_BLUETOOTH_SERVICE_OPTIONS = 293, - STR_HFP = 294, - STR_A2DP = 295, - STR_SYSTEM_VOLUME = 296, - STR_MEDIA_VOLUME = 297, - STR_VIBRATION_MODE = 298, - STR_SILENT_MODE = 299, - STR_LIST_DISPLAY = 300, - STR_GRID_DISPLAY = 301, - STR_CELLULAR_DISPLAY = 302, - STR_AUTO_DETECT = 303, - STR_ABOUT_WATCH = 304, - STR_WATCH_QR_CODE = 305, - STR_SYSTEM_LANGUAGE = 306, - STR_RESTART = 307, - STR_SHUTDOWN = 308, - STR_FACTORY_RESET = 309, - STR_WATCH_NAME = 310, - STR_FIRMWARE_VERSION = 311, - STR_BLUETOOTH_NAME = 312, - STR_BLUETOOTH_ADDRESS = 313, - STR_LATEST_VERSION = 314, - STR_UPDATENOW = 315, - STR_LATER = 316, - STR_UP_TO_DATE = 317, - STR_NO_UPDATE = 318, - STR_LANGUAGE_SELECTION = 319, - STR_RESET_CONFIRM = 320, - STR_SHUTDOWN_CONFIRM = 321, - STR_RESET_CONFIRM_NOTE = 322, - STR_RECORDER = 323, - STR_CLICK_TO_RECORD = 324, - STR_RECORDING = 325, - STR_AUDIO_XX = 326, - STR_VOICE_RECORDING_REMINDER = 327, - STR_VOICE_RECORDING_REMINDER_NOTE = 328, - STR_DELETE_RECORDING = 329, - STR_DELETE_PERMANENTLY = 330, - STR_DO_NOT_DISTURB_MODE = 331, - STR_CONNECTION_STATUS = 332, - STR_HEADSET = 333, - STR_CONNECTED = 334, - STR_DISCONNECTED = 335, - STR_PHONE_RINGING_VIBRATING = 336, - STR_BLUETOOTH_DISCONNECTED = 337, - STR_STOP = 338, - STR_WORKDAY = 339, - STR_REPEAT_NO = 340, - STR_EVERYDAY = 341, - STR_ADD_A_NEW_ALARM = 342, - STR_TIME = 343, - STR_NEXT_STEP = 344, - STR_MONDAY = 345, - STR_TUESDAY = 346, - STR_WEDNESDAY = 347, - STR_THURSDAY = 348, - STR_FRIDAY = 349, - STR_SATURDAY = 350, - STR_SUNDAY = 351, - STR_CALIBRATE_COMPASS = 352, - STR_CALIBRATE_COMPASS_NOTE = 353, - STR_EAST = 354, - STR_SOUTH = 355, - STR_WEST = 356, - STR_NORTH = 357, - STR_SOUTHEAST = 358, - STR_SOUTHWEST = 359, - STR_NORTHEAST = 360, - STR_NORTHWEST = 361, - STR_KEEP_STILL_FOCUS_ON_BREATHING = 362, - STR_EXHALE_NOW = 363, - STR_INHALE_NOW = 364, - STR_TRAINING_COMPLETE = 365, - STR_BREATHING_TRAINING = 366, - STR_THIS_BREATH = 367, - STR_TODAYS_BREATHING_TRAINING = 368, - STR_RECENT_CALLS = 369, - STR_NO_CALLS = 370, - STR_MISSED_CALLS = 371, - STR_DIALED_CALLS = 372, - STR_RECEIVED_CALLS = 373, - STR_NOTE_RECENT_CALLS_LIMITATION = 374, - STR_NO_CONTACTS_ADDED = 375, - STR_DIAL_MODE = 376, - STR_DIAL_VIA_WATCH_SIM = 377, - STR_DIAL_VIA_PHONE = 378, - STR_KUMI_TECHNOLOGY = 379, - STR_CALLING = 380, - STR_NOT_PAIRED = 381, - STR_PAIRED = 382, - STR_UNPAIR = 383, - STR_CONNECTION_ERROR = 384, - STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385, - STR_ENABLE_BLUETOOTH_CALL = 386, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 387, - STR_SIM_CARD_ERROR = 388, - STR_CHECK_SIM_CARD_INSERTION = 389, - STR_WEATHER_REPORT = 390, - STR_ULTRAVIOLET = 391, - STR_WIND_SPEED = 392, - STR_HUMIDITY = 393, - STR_NEXT_7_DAYS = 394, - STR_GET_WEATHER_ERROR = 395, - STR_MUSIC_SOURCE = 396, - STR_MOBILE_MUSIC = 397, - STR_WATCH_MUSIC = 398, - STR_MUSIC_LIST = 399, - STR_BLUETOOTH_CONNECTION_FAILED = 400, - STR_SCANNING_BINDING = 401, - STR_DEVICE_BINDING = 402, - STR_DEVICE_BINDING_NOTE = 403, - STR_EQUIPMENT_UNTYING = 404, - STR_EQUIPMENT_UNTYING_NOTE = 405, - STR_DRINK_WATER_REMINDER = 406, - STR_DRINK_WATER_REMINDER_NOTE = 407, - STR_SEDENTARY_REMINDER = 408, - STR_SEDENTARY_REMINDER_NOTE = 409, - STR_SYSTEM_UPGRADING = 410, - STR_NEWDEVICE_BIND_REMIND_NOTE = 411, - STR_TABULAR_DISPLAY = 412, - STR_RANGE_MILE = 413, - STR_CLOSE = 414, - STR_MORE_APP = 415, - STR_SAVENOTE = 416, - STR_SAVEBACK = 417, - STR_SAVEASK = 418, - STR_BLOOD = 419, - STR_CHECK = 420, - STR_CHECKNEW = 421, - STR_CHECKTIME = 422, - STR_CHECKLONG = 423, - STR_CHECKNO = 424, - STR_CHECKNOTE = 425, - STR_CHECKON = 426, - STR_CHECKSTOP = 427, - STR_CHECKERROR = 428, - STR_WAERKEEP = 429, - STR_WEARRE = 430, - STR_WEARREADY = 431, - STR_RECHECK = 432, - STR_CHECKEWARN = 433, - STR_BLOODSHORT = 434, - STR_HEARTNOTE = 435, - STR_KONW = 436, - STR_EXPLAIN = 437, - STR_HEARTREST = 438, - STR_HEARTDATA = 439, - STR_HEARTTITLE = 440, - STR_HEARTMAX = 441, - STR_HEARTMIN = 442, - STR_TRAINGNO = 443, - STR_TRAINGGO = 444, - STR_MESSAGE = 445, - STR_MESSAGENO = 446, - STR_DIS = 447, - STR_DUR = 448, - STR_STANDUP = 449, - STR_SLEEPHOUR = 450, - STR_SLEEPMGOAL = 451, - STR_REATTIME = 452, - STR_SLEEPTIME = 453, - STR_WALKTIME = 454, - STR_DISTURB = 455, - STR_DISTURBNOTE = 456, - STR_MORNNING = 457, - STR_NOW = 458, - STR_NAP = 459, - STR_TACK = 460, - STR_CLICK = 461, - STR_TACKNUM = 462, - STR_MON = 463, - STR_TUES = 464, - STR_WEDNES = 465, - STR_THURS = 466, - STR_FRI = 467, - STR_SATUR = 468, - STR_SUN = 469, - STR_RECORDING_LIST = 470, - STR_CRLEMPTY = 471, - STR_CALL_VOLUME = 472, - STR_AI_VOICE = 473, - STR_AI_INTELLIGENT_ASSISTANT = 474, - STR_START_CHAT = 475, - STR_BOOT_FAILED = 476, - STR_ENABLE_MOBILE_DATA_FIRST = 477, - STR_ENABLE_BLUETOOTH_FIRST = 478, - STR_LISTENING = 479, - STR_FINISH_SPEAKING = 480, - STR_THINKING = 481, - STR_CANCEL = 482, - STR_CONNECT_TIMEOUT = 483, - STR_PLEASE_RESTART_CHAT = 484, - STR_CONTINUE_CHAT = 485, - STR_MAX_ID = 486, + STR_RANGE_MILE = 241, + STR_CLOSE = 242, + STR_MORE_APP = 243, + STR_SAVENOTE = 244, + STR_SAVEBACK = 245, + STR_SAVEASK = 246, + STR_BLOOD = 247, + STR_CHECK = 248, + STR_CHECKNEW = 249, + STR_CHECKTIME = 250, + STR_CHECKLONG = 251, + STR_CHECKNO = 252, + STR_CHECKNOTE = 253, + STR_CHECKON = 254, + STR_CHECKSTOP = 255, + STR_CHECKERROR = 256, + STR_WAERKEEP = 257, + STR_WEARRE = 258, + STR_WEARREADY = 259, + STR_RECHECK = 260, + STR_CHECKEWARN = 261, + STR_BLOODSHORT = 262, + STR_HEARTNOTE = 263, + STR_KONW = 264, + STR_EXPLAIN = 265, + STR_HEARTREST = 266, + STR_HEARTDATA = 267, + STR_HEARTTITLE = 268, + STR_HEARTMAX = 269, + STR_HEARTMIN = 270, + STR_TRAINGNO = 271, + STR_TRAINGGO = 272, + STR_MESSAGE = 273, + STR_MESSAGENO = 274, + STR_CLEAN = 275, + STR_CLEANALL = 276, + STR_SLEEP = 277, + STR_SLEEPHOUR = 278, + STR_SLEEPMGOAL = 279, + STR_REATTIME = 280, + STR_SLEEPTIME = 281, + STR_WALKTIME = 282, + STR_DISTURB = 283, + STR_DISTURBNOTE = 284, + STR_MORNNING = 285, + STR_NOW = 286, + STR_NAP = 287, + STR_TACK = 288, + STR_CLICK = 289, + STR_TACKNUM = 290, + STR_BLOOD_OXYGEN = 291, + STR_TRAINING_RECORD = 292, + STR_COMPASS = 293, + STR_PHONE = 294, + STR_FAVORITE_CONTACTS = 295, + STR_WEATHER = 296, + STR_ACTIVITY = 297, + STR_WATCH_FACE = 298, + STR_DISPLAY_MODE = 299, + STR_CARD_MANAGEMENT = 300, + STR_MUSIC = 301, + STR_RECORD = 302, + STR_BREATH_TRAINING = 303, + STR_REMOTE_SHOOTING = 304, + STR_VOICE_ASSISTANT = 305, + STR_ALIPAY = 306, + STR_TIMER = 307, + STR_ALARM = 308, + STR_STOPWATCH = 309, + STR_CALCULATOR = 310, + STR_FIND_PHONE = 311, + STR_BRIGHTNESS_ADJUSTMENT = 312, + STR_SOUND = 313, + STR_BLUETOOTH = 314, + STR_DO_NOT_DISTURB = 315, + STR_MESSAGE_NOTIFICATION = 316, + STR_POWER_SAVE_MODE = 317, + STR_FLASHLIGHT = 318, + STR_SETTINGS = 319, + STR_SCREEN_AND_BRIGHTNESS = 320, + STR_NETWORKANDCALL = 321, + STR_SOUND_AND_VIBRATION = 322, + STR_MOTION_RECOGNITION = 323, + STR_SYSTEM = 324, + STR_SHUTDOWN_AND_RESTART = 325, + STR_SCREEN_ON_DURATION = 326, + STR_RAISE_TO_WAKE = 327, + STR_5_SECONDS = 328, + STR_10_SECONDS = 329, + STR_15_SECONDS = 330, + STR_30_SECONDS = 331, + STR_60_SECONDS = 332, + STR_300_SECONDS = 333, + STR_4G_CAPABILITY = 334, + STR_VOLTE_CALL = 335, + STR_MOBILE_DATA_OPTION = 336, + STR_SYSTEM_UPDATE = 337, + STR_ONLINE_MUSIC = 338, + STR_BLUETOOTH_HEADPHONES = 339, + STR_TRADITIONAL_BLUETOOTH = 340, + STR_AUTO_OFF_BLUETOOTH_NOTE = 341, + STR_BLUETOOTH_SERVICE_OPTIONS = 342, + STR_HFP = 343, + STR_A2DP = 344, + STR_SYSTEM_VOLUME = 345, + STR_MEDIA_VOLUME = 346, + STR_VIBRATION_MODE = 347, + STR_SILENT_MODE = 348, + STR_LIST_DISPLAY = 349, + STR_GRID_DISPLAY = 350, + STR_CELLULAR_DISPLAY = 351, + STR_AUTO_DETECT = 352, + STR_ABOUT_WATCH = 353, + STR_WATCH_QR_CODE = 354, + STR_SYSTEM_LANGUAGE = 355, + STR_RESTART = 356, + STR_SHUTDOWN = 357, + STR_FACTORY_RESET = 358, + STR_WATCH_NAME = 359, + STR_FIRMWARE_VERSION = 360, + STR_BLUETOOTH_NAME = 361, + STR_BLUETOOTH_ADDRESS = 362, + STR_LATEST_VERSION = 363, + STR_UPDATENOW = 364, + STR_LATER = 365, + STR_UP_TO_DATE = 366, + STR_NO_UPDATE = 367, + STR_LANGUAGE_SELECTION = 368, + STR_RESET_CONFIRM = 369, + STR_SHUTDOWN_CONFIRM = 370, + STR_RESET_CONFIRM_NOTE = 371, + STR_RECORDER = 372, + STR_CLICK_TO_RECORD = 373, + STR_RECORDING = 374, + STR_AUDIO_XX = 375, + STR_VOICE_RECORDING_REMINDER = 376, + STR_VOICE_RECORDING_REMINDER_NOTE = 377, + STR_DELETE_RECORDING = 378, + STR_DELETE_PERMANENTLY = 379, + STR_DO_NOT_DISTURB_MODE = 380, + STR_CONNECTION_STATUS = 381, + STR_HEADSET = 382, + STR_CONNECTED = 383, + STR_DISCONNECTED = 384, + STR_PHONE_RINGING_VIBRATING = 385, + STR_BLUETOOTH_DISCONNECTED = 386, + STR_STOP = 387, + STR_WORKDAY = 388, + STR_REPEAT_NO = 389, + STR_EVERYDAY = 390, + STR_ADD_A_NEW_ALARM = 391, + STR_TIME = 392, + STR_NEXT_STEP = 393, + STR_MON = 394, + STR_TUES = 395, + STR_WEDNES = 396, + STR_THURS = 397, + STR_FRI = 398, + STR_SATUR = 399, + STR_SUN = 400, + STR_MONDAY = 401, + STR_TUESDAY = 402, + STR_WEDNESDAY = 403, + STR_THURSDAY = 404, + STR_FRIDAY = 405, + STR_SATURDAY = 406, + STR_SUNDAY = 407, + STR_CALIBRATE_COMPASS = 408, + STR_CALIBRATE_COMPASS_NOTE = 409, + STR_EAST = 410, + STR_SOUTH = 411, + STR_WEST = 412, + STR_NORTH = 413, + STR_SOUTHEAST = 414, + STR_SOUTHWEST = 415, + STR_NORTHEAST = 416, + STR_NORTHWEST = 417, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 418, + STR_EXHALE_NOW = 419, + STR_INHALE_NOW = 420, + STR_TRAINING_COMPLETE = 421, + STR_BREATHING_TRAINING = 422, + STR_THIS_BREATH = 423, + STR_TODAYS_BREATHING_TRAINING = 424, + STR_RECENT_CALLS = 425, + STR_NO_CALLS = 426, + STR_MISSED_CALLS = 427, + STR_DIALED_CALLS = 428, + STR_RECEIVED_CALLS = 429, + STR_NOTE_RECENT_CALLS_LIMITATION = 430, + STR_NO_CONTACTS_ADDED = 431, + STR_DIAL_MODE = 432, + STR_DIAL_VIA_WATCH_SIM = 433, + STR_DIAL_VIA_PHONE = 434, + STR_KUMI_TECHNOLOGY = 435, + STR_CALLING = 436, + STR_NOT_PAIRED = 437, + STR_PAIRED = 438, + STR_UNPAIR = 439, + STR_CONNECTION_ERROR = 440, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 441, + STR_ENABLE_BLUETOOTH_CALL = 442, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 443, + STR_SIM_CARD_ERROR = 444, + STR_CHECK_SIM_CARD_INSERTION = 445, + STR_WEATHER_REPORT = 446, + STR_ULTRAVIOLET = 447, + STR_WIND_SPEED = 448, + STR_HUMIDITY = 449, + STR_NEXT_7_DAYS = 450, + STR_GET_WEATHER_ERROR = 451, + STR_MUSIC_SOURCE = 452, + STR_MOBILE_MUSIC = 453, + STR_WATCH_MUSIC = 454, + STR_MUSIC_LIST = 455, + STR_BLUETOOTH_CONNECTION_FAILED = 456, + STR_SCANNING_BINDING = 457, + STR_DEVICE_BINDING = 458, + STR_DEVICE_BINDING_NOTE = 459, + STR_EQUIPMENT_UNTYING = 460, + STR_EQUIPMENT_UNTYING_NOTE = 461, + STR_DRINK_WATER_REMINDER = 462, + STR_DRINK_WATER_REMINDER_NOTE = 463, + STR_SEDENTARY_REMINDER = 464, + STR_SEDENTARY_REMINDER_NOTE = 465, + STR_SYSTEM_UPGRADING = 466, + STR_NEWDEVICE_BIND_REMIND_NOTE = 467, + STR_TABULAR_DISPLAY = 468, + STR_RECORDING_LIST = 469, + STR_CRLEMPTY = 470, + STR_CALL_VOLUME = 471, + STR_AI_VOICE = 472, + STR_AI_INTELLIGENT_ASSISTANT = 473, + STR_START_CHAT = 474, + STR_BOOT_FAILED = 475, + STR_ENABLE_MOBILE_DATA_FIRST = 476, + STR_ENABLE_BLUETOOTH_FIRST = 477, + STR_LISTENING = 478, + STR_FINISH_SPEAKING = 479, + STR_THINKING = 480, + STR_CANCEL = 481, + STR_CONNECT_TIMEOUT = 482, + STR_PLEASE_RESTART_CHAT = 483, + STR_CONTINUE_CHAT = 484, + STR_MAX_ID = 485, }; // UIResourceTextId enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang index ca52a6dc1..224c9cc49 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h index 4833ec0e7..6b650912c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-22 17:52:45 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h + */ /*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com @@ -30,6 +36,7 @@ #include "message/include/MessageModel.h" namespace OHOS { + #define MAINMESSAGEVIEW "messagecard" class MessageCardView : public AppGroupView { public: diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h new file mode 100644 index 000000000..b82d73caf --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h @@ -0,0 +1,47 @@ +/*** + * @Date: 2024-06-22 11:36:07 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-22 14:57:34 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h + */ +/*** + * @Date: 2024-06-22 11:36:16 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-22 11:39:50 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp + */ + +#ifndef MESSAGE_CONTROL_PRESENTER_H +#define MESSAGE_CONTROL_PRESENTER_H + +#include "Presenter.h" +#include "components/ui_view.h" +#include "components/ui_image_view.h" +#include "ohos_types.h" +#include "UiConfig.h" +#include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" +#include "message/include/MessageControlView.h" + +namespace OHOS +{ + class MessageControlView; + class MessageControlPresenter : public UIView::OnClickListener + { + public: + MessageControlPresenter(){}; + virtual ~MessageControlPresenter(){}; + static MessageControlPresenter *GetInstance() + { + static MessageControlPresenter instance; + return &instance; + } + + bool OnClick(UIView &view, const ClickEvent &event) override; + + private: + UIView *view_{nullptr}; + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp index b91bf9b67..4f9742bd5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp @@ -10,6 +10,7 @@ #include "message/include/MessageCardView.h" #include "message/include/MessagePresenter.h" #include "uicomponents/UIComponents.h" +#include "message/include/MessageControlPresenter.h" namespace OHOS { @@ -84,9 +85,16 @@ namespace OHOS MessageList->EnableAutoAlign(true); MessageList->SetElastic(true); // 设置回弹效果 MessageList->SetMaxScrollDistance(MAX_SCR_DIS); + MessageList->SetViewId(MAINMESSAGEVIEW); // SetYScrollBarVisible(true); // 设置滑动滚动条 - MessageList->SetOnClickListener(static_cast(MessagePresenter::GetInstance())); + UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MessageControlPresenter::GetInstance(); + if (clickListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddButton::OnStart clickListener NULL"); + return false; + } + MessageList->SetOnClickListener(clickListener); UIView::OnDragListener *Messagedraglistener = static_cast(MessagePresenter::GetInstance()); #if 0 /*删除按键*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp new file mode 100644 index 000000000..aa123a75e --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp @@ -0,0 +1,82 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-16 17:36:17 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/training_card/src/MessageControlPresenter.cpp + */ + +#include "message/include/MessageControlPresenter.h" +#include "message/include/MessageControlView.h" +#include "message/include/MessageModel.h" + +#include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" +#include "NativeAbility.h" +#include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" +#include "UiConfig.h" +#include "wearable_log.h" + +#include "uicomponents/UIComponents.h" + +namespace OHOS +{ + bool MessageControlPresenter::OnClick(UIView &view, const ClickEvent &event) + { + UNUSED(event); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::OnClick %s", view.GetViewId()); + if (strcmp(view.GetViewId(), MAINMESSAGEVIEW) != 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: View is not List"); + return false; + } + + if (!MessageModel::GetInstance().GetJsonLoadStatus()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Json data not loaded."); + return false; + } + + // 获取 MessageItemView 并检查索引 + MessageItemView *p_MessageItemView = static_cast(&view); + if (!p_MessageItemView) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid view type."); + return false; + } + MessageCardView::GetInstance()->GetList()->GetViewIndex(); + int index = p_MessageItemView->GetMessageListIndex(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index is %d", index); + // 读取json数据 + std::vector messageDataVector = MessageModel::GetInstance().LoadMessageData(); + + if (messageDataVector.empty()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: messageDataVector is empty"); + return false; + } + + if (index < 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index < 0)"); + return false; + } + + if (index >= messageDataVector.size()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index out of range)"); + return false; + } + + int arraynum = messageDataVector.size() - 1; + MessageData &messageData = messageDataVector[arraynum - index]; + + MessageModel::GetInstance().SetCurrentMessageData(&messageData); + MessageModel::GetInstance().SetCurrentIndex(arraynum - index); + // 切换到详情界面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW); + + return true; // 返回 true 表示点击事件处理成功 + } +} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp index 938ac9ab5..13f0c574a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp @@ -6,6 +6,7 @@ */ #include "message/include/MessageControlView.h" #include "message/include/MessageModel.h" +#include"message/include/MessageControlPresenter.h" #include "wearable_log.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp index 9ecef0304..ebbcb8995 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp @@ -1,4 +1,10 @@ -/*** +/* + * @Date: 2024-06-21 09:56:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-22 15:32:37 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp + */ +/* * @Author: Caisking 3449750381@qq.com * @Date: 2024-01-29 19:58:37 * @LastEditors: Caisking 3449750381@qq.com @@ -115,7 +121,7 @@ namespace OHOS // 这里根据解析的 JSON 数据类型修改 messagedata.isRead 的精确类型 messagedata.isRead = cJSON_GetObjectItem(item, "read")->valueint; - PrintData(messagedata); + // PrintData(messagedata); MessageVector.push_back(messagedata); } cJSON_Delete(root); @@ -158,12 +164,12 @@ namespace OHOS } void MessageModel::PrintData(MessageData messagedata) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "**************************************"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "--------------------------------------"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Title: %s", (messagedata.labelTitle).c_str()); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Details: %s", (messagedata.labelDetails).c_str()); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Time: %s", (messagedata.labelTime).c_str()); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Read: %d", messagedata.isRead); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "**************************************"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "--------------------------------------"); } void MessageModel::InitMessageListItems() { @@ -180,7 +186,7 @@ namespace OHOS messageData.labelTitle = messageVector[i].labelTitle; messageData.labelDetails = messageVector[i].labelDetails; messageData.labelTime = messageVector[i].labelTime; - PrintData(messageData); + // PrintData(messageData); // 获取是否读取 来信 信息内容 时间 Messages[count] = {count, messageData.isRead, messageData.labelTitle, messageData.labelDetails, messageData.labelTime}; } @@ -210,6 +216,7 @@ namespace OHOS // 获取目前的message MessageData *MessageModel::GetCurrentMessageData() { + PrintData(message_); return &message_; } // 设置目前的message diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp index 4199190e5..5d9abf3ed 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp @@ -115,21 +115,46 @@ namespace OHOS return true; } /* -------------------------------------------------------------------------- */ + // 获取 MessageItemView 并检查索引 MessageItemView *p_MessageItemView = static_cast(&view); + if (!p_MessageItemView) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid view type."); + return false; + } + int index = p_MessageItemView->GetMessageListIndex(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the index is %d", index); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index is %d", index); // 读取json数据 std::vector messageDataVector = MessageModel::GetInstance().LoadMessageData(); - if (!messageDataVector.empty()) + + if (messageDataVector.empty()) { - // 选择点击按键的历史数据 - int arraynum = messageDataVector.size() - 1; - MessageData messageData = messageDataVector[arraynum - index]; // 显示是倒序 id同理 - MessageModel::GetInstance().SetCurrentMessageData(&messageData); - MessageModel::GetInstance().SetCurrentIndex(arraynum - index); - NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW); - return true; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: messageDataVector is empty"); + return false; + } + + if (index < 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index < 0)"); + return false; + } + + if (index >= messageDataVector.size()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index out of range)"); + return false; } + + int arraynum = messageDataVector.size() - 1; + MessageData &messageData = messageDataVector[arraynum - index]; + + MessageModel::GetInstance().SetCurrentMessageData(&messageData); + MessageModel::GetInstance().SetCurrentIndex(arraynum - index); + // 切换到详情界面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW); + + return true; // 返回 true 表示点击事件处理成功 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the messageDataVector is error"); } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp index 261cad327..bee94e862 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp @@ -42,7 +42,7 @@ namespace OHOS std::string messageStr = "【铁路12306】系统已自动为您生成订单EC09828333,04月23日G2231次,深圳北站13:31开。请您在2小时内完成支付。您可通过以下链接进行支付。https://www.12306.cn/index/"; #endif std::string titleStr, timeStr, messageStr; - + MessageShowView::MessageShowView() { g_pMessageShowView = this; @@ -131,7 +131,7 @@ namespace OHOS } void MessageShowView::InitView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView"); /* -------------------------------------------------------------------------- */ title = new UILabel(); if (title == nullptr) @@ -146,7 +146,6 @@ namespace OHOS title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetVisible(true); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "title is ok!"); /* -------------------------------------------------------------------------- */ time = new UILabel(); if (time == nullptr) @@ -163,21 +162,17 @@ namespace OHOS time->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); time->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); time->SetVisible(true); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "time is ok!"); /* -------------------------------------------------------------------------- */ /*初始化消息内容*/ InitializeButton(messageButton, 33, 157, 380, 350, "message"); messageButton->SetStyle(STYLE_BORDER_RADIUS, 30); messageButton->SetText(messageStr.c_str()); - // messageButton->SetAlign(TEXT_ALIGNMENT_LEFT); messageButton->SetTextColor(Color::Gray()); messageButton->SetTouchable(false); messageButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageButton"); /*加载清除按键*/ - InitButtonExt(deleteButton, 43, 527, 380, 100, DELETEBUTTON, STR_CLOSE, 30); + InitButtonExt(deleteButton, 43, 527, 380, 100, DELETEBUTTON, STR_CLEAN, 30); deleteButton->SetOnClickListener(static_cast(MessageShowPresenter::GetInstance())); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "deleteButton"); /* -------------------------------------------------------------------------- */ container_->Add(title); container_->Add(time); @@ -213,7 +208,7 @@ namespace OHOS void MessageShowView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart"); container_ = new UIScrollView(); if (container_ == nullptr) { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index f1028ed8f..55bbff129 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang index 13f845c2b..00e921d5b 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 561c4c70b..cf356056c 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -251,258 +251,257 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_BLOOD_OXYGEN = 241, - STR_TRAINING_RECORD = 242, - STR_COMPASS = 243, - STR_PHONE = 244, - STR_FAVORITE_CONTACTS = 245, - STR_WEATHER = 246, - STR_ACTIVITY = 247, - STR_WATCH_FACE = 248, - STR_DISPLAY_MODE = 249, - STR_CARD_MANAGEMENT = 250, - STR_MUSIC = 251, - STR_SLEEP = 252, - STR_RECORD = 253, - STR_BREATH_TRAINING = 254, - STR_REMOTE_SHOOTING = 255, - STR_VOICE_ASSISTANT = 256, - STR_ALIPAY = 257, - STR_TIMER = 258, - STR_ALARM = 259, - STR_STOPWATCH = 260, - STR_CALCULATOR = 261, - STR_FIND_PHONE = 262, - STR_BRIGHTNESS_ADJUSTMENT = 263, - STR_SOUND = 264, - STR_BLUETOOTH = 265, - STR_DO_NOT_DISTURB = 266, - STR_MESSAGE_NOTIFICATION = 267, - STR_POWER_SAVE_MODE = 268, - STR_FLASHLIGHT = 269, - STR_SETTINGS = 270, - STR_SCREEN_AND_BRIGHTNESS = 271, - STR_NETWORKANDCALL = 272, - STR_SOUND_AND_VIBRATION = 273, - STR_MOTION_RECOGNITION = 274, - STR_SYSTEM = 275, - STR_SHUTDOWN_AND_RESTART = 276, - STR_SCREEN_ON_DURATION = 277, - STR_RAISE_TO_WAKE = 278, - STR_5_SECONDS = 279, - STR_10_SECONDS = 280, - STR_15_SECONDS = 281, - STR_30_SECONDS = 282, - STR_60_SECONDS = 283, - STR_300_SECONDS = 284, - STR_4G_CAPABILITY = 285, - STR_VOLTE_CALL = 286, - STR_MOBILE_DATA_OPTION = 287, - STR_SYSTEM_UPDATE = 288, - STR_ONLINE_MUSIC = 289, - STR_BLUETOOTH_HEADPHONES = 290, - STR_TRADITIONAL_BLUETOOTH = 291, - STR_AUTO_OFF_BLUETOOTH_NOTE = 292, - STR_BLUETOOTH_SERVICE_OPTIONS = 293, - STR_HFP = 294, - STR_A2DP = 295, - STR_SYSTEM_VOLUME = 296, - STR_MEDIA_VOLUME = 297, - STR_VIBRATION_MODE = 298, - STR_SILENT_MODE = 299, - STR_LIST_DISPLAY = 300, - STR_GRID_DISPLAY = 301, - STR_CELLULAR_DISPLAY = 302, - STR_AUTO_DETECT = 303, - STR_ABOUT_WATCH = 304, - STR_WATCH_QR_CODE = 305, - STR_SYSTEM_LANGUAGE = 306, - STR_RESTART = 307, - STR_SHUTDOWN = 308, - STR_FACTORY_RESET = 309, - STR_WATCH_NAME = 310, - STR_FIRMWARE_VERSION = 311, - STR_BLUETOOTH_NAME = 312, - STR_BLUETOOTH_ADDRESS = 313, - STR_LATEST_VERSION = 314, - STR_UPDATENOW = 315, - STR_LATER = 316, - STR_UP_TO_DATE = 317, - STR_NO_UPDATE = 318, - STR_LANGUAGE_SELECTION = 319, - STR_RESET_CONFIRM = 320, - STR_SHUTDOWN_CONFIRM = 321, - STR_RESET_CONFIRM_NOTE = 322, - STR_RECORDER = 323, - STR_CLICK_TO_RECORD = 324, - STR_RECORDING = 325, - STR_AUDIO_XX = 326, - STR_VOICE_RECORDING_REMINDER = 327, - STR_VOICE_RECORDING_REMINDER_NOTE = 328, - STR_DELETE_RECORDING = 329, - STR_DELETE_PERMANENTLY = 330, - STR_DO_NOT_DISTURB_MODE = 331, - STR_CONNECTION_STATUS = 332, - STR_HEADSET = 333, - STR_CONNECTED = 334, - STR_DISCONNECTED = 335, - STR_PHONE_RINGING_VIBRATING = 336, - STR_BLUETOOTH_DISCONNECTED = 337, - STR_STOP = 338, - STR_WORKDAY = 339, - STR_REPEAT_NO = 340, - STR_EVERYDAY = 341, - STR_ADD_A_NEW_ALARM = 342, - STR_TIME = 343, - STR_NEXT_STEP = 344, - STR_MONDAY = 345, - STR_TUESDAY = 346, - STR_WEDNESDAY = 347, - STR_THURSDAY = 348, - STR_FRIDAY = 349, - STR_SATURDAY = 350, - STR_SUNDAY = 351, - STR_CALIBRATE_COMPASS = 352, - STR_CALIBRATE_COMPASS_NOTE = 353, - STR_EAST = 354, - STR_SOUTH = 355, - STR_WEST = 356, - STR_NORTH = 357, - STR_SOUTHEAST = 358, - STR_SOUTHWEST = 359, - STR_NORTHEAST = 360, - STR_NORTHWEST = 361, - STR_KEEP_STILL_FOCUS_ON_BREATHING = 362, - STR_EXHALE_NOW = 363, - STR_INHALE_NOW = 364, - STR_TRAINING_COMPLETE = 365, - STR_BREATHING_TRAINING = 366, - STR_THIS_BREATH = 367, - STR_TODAYS_BREATHING_TRAINING = 368, - STR_RECENT_CALLS = 369, - STR_NO_CALLS = 370, - STR_MISSED_CALLS = 371, - STR_DIALED_CALLS = 372, - STR_RECEIVED_CALLS = 373, - STR_NOTE_RECENT_CALLS_LIMITATION = 374, - STR_NO_CONTACTS_ADDED = 375, - STR_DIAL_MODE = 376, - STR_DIAL_VIA_WATCH_SIM = 377, - STR_DIAL_VIA_PHONE = 378, - STR_KUMI_TECHNOLOGY = 379, - STR_CALLING = 380, - STR_NOT_PAIRED = 381, - STR_PAIRED = 382, - STR_UNPAIR = 383, - STR_CONNECTION_ERROR = 384, - STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385, - STR_ENABLE_BLUETOOTH_CALL = 386, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 387, - STR_SIM_CARD_ERROR = 388, - STR_CHECK_SIM_CARD_INSERTION = 389, - STR_WEATHER_REPORT = 390, - STR_ULTRAVIOLET = 391, - STR_WIND_SPEED = 392, - STR_HUMIDITY = 393, - STR_NEXT_7_DAYS = 394, - STR_GET_WEATHER_ERROR = 395, - STR_MUSIC_SOURCE = 396, - STR_MOBILE_MUSIC = 397, - STR_WATCH_MUSIC = 398, - STR_MUSIC_LIST = 399, - STR_BLUETOOTH_CONNECTION_FAILED = 400, - STR_SCANNING_BINDING = 401, - STR_DEVICE_BINDING = 402, - STR_DEVICE_BINDING_NOTE = 403, - STR_EQUIPMENT_UNTYING = 404, - STR_EQUIPMENT_UNTYING_NOTE = 405, - STR_DRINK_WATER_REMINDER = 406, - STR_DRINK_WATER_REMINDER_NOTE = 407, - STR_SEDENTARY_REMINDER = 408, - STR_SEDENTARY_REMINDER_NOTE = 409, - STR_SYSTEM_UPGRADING = 410, - STR_NEWDEVICE_BIND_REMIND_NOTE = 411, - STR_TABULAR_DISPLAY = 412, - STR_RANGE_MILE = 413, - STR_CLOSE = 414, - STR_MORE_APP = 415, - STR_SAVENOTE = 416, - STR_SAVEBACK = 417, - STR_SAVEASK = 418, - STR_BLOOD = 419, - STR_CHECK = 420, - STR_CHECKNEW = 421, - STR_CHECKTIME = 422, - STR_CHECKLONG = 423, - STR_CHECKNO = 424, - STR_CHECKNOTE = 425, - STR_CHECKON = 426, - STR_CHECKSTOP = 427, - STR_CHECKERROR = 428, - STR_WAERKEEP = 429, - STR_WEARRE = 430, - STR_WEARREADY = 431, - STR_RECHECK = 432, - STR_CHECKEWARN = 433, - STR_BLOODSHORT = 434, - STR_HEARTNOTE = 435, - STR_KONW = 436, - STR_EXPLAIN = 437, - STR_HEARTREST = 438, - STR_HEARTDATA = 439, - STR_HEARTTITLE = 440, - STR_HEARTMAX = 441, - STR_HEARTMIN = 442, - STR_TRAINGNO = 443, - STR_TRAINGGO = 444, - STR_MESSAGE = 445, - STR_MESSAGENO = 446, - STR_DIS = 447, - STR_DUR = 448, - STR_STANDUP = 449, - STR_SLEEPHOUR = 450, - STR_SLEEPMGOAL = 451, - STR_REATTIME = 452, - STR_SLEEPTIME = 453, - STR_WALKTIME = 454, - STR_DISTURB = 455, - STR_DISTURBNOTE = 456, - STR_MORNNING = 457, - STR_NOW = 458, - STR_NAP = 459, - STR_TACK = 460, - STR_CLICK = 461, - STR_TACKNUM = 462, - STR_MON = 463, - STR_TUES = 464, - STR_WEDNES = 465, - STR_THURS = 466, - STR_FRI = 467, - STR_SATUR = 468, - STR_SUN = 469, - STR_RECORDING_LIST = 470, - STR_CRLEMPTY = 471, - STR_CALL_VOLUME = 472, - STR_AI_VOICE = 473, - STR_AI_INTELLIGENT_ASSISTANT = 474, - STR_START_CHAT = 475, - STR_BOOT_FAILED = 476, - STR_ENABLE_MOBILE_DATA_FIRST = 477, - STR_ENABLE_BLUETOOTH_FIRST = 478, - STR_LISTENING = 479, - STR_FINISH_SPEAKING = 480, - STR_THINKING = 481, - STR_CANCEL = 482, - STR_CONNECT_TIMEOUT = 483, - STR_PLEASE_RESTART_CHAT = 484, - STR_CONTINUE_CHAT = 485, - STR_MAX_ID = 486, + STR_RANGE_MILE = 241, + STR_CLOSE = 242, + STR_MORE_APP = 243, + STR_SAVENOTE = 244, + STR_SAVEBACK = 245, + STR_SAVEASK = 246, + STR_BLOOD = 247, + STR_CHECK = 248, + STR_CHECKNEW = 249, + STR_CHECKTIME = 250, + STR_CHECKLONG = 251, + STR_CHECKNO = 252, + STR_CHECKNOTE = 253, + STR_CHECKON = 254, + STR_CHECKSTOP = 255, + STR_CHECKERROR = 256, + STR_WAERKEEP = 257, + STR_WEARRE = 258, + STR_WEARREADY = 259, + STR_RECHECK = 260, + STR_CHECKEWARN = 261, + STR_BLOODSHORT = 262, + STR_HEARTNOTE = 263, + STR_KONW = 264, + STR_EXPLAIN = 265, + STR_HEARTREST = 266, + STR_HEARTDATA = 267, + STR_HEARTTITLE = 268, + STR_HEARTMAX = 269, + STR_HEARTMIN = 270, + STR_TRAINGNO = 271, + STR_TRAINGGO = 272, + STR_MESSAGE = 273, + STR_MESSAGENO = 274, + STR_CLEAN = 275, + STR_CLEANALL = 276, + STR_SLEEP = 277, + STR_SLEEPHOUR = 278, + STR_SLEEPMGOAL = 279, + STR_REATTIME = 280, + STR_SLEEPTIME = 281, + STR_WALKTIME = 282, + STR_DISTURB = 283, + STR_DISTURBNOTE = 284, + STR_MORNNING = 285, + STR_NOW = 286, + STR_NAP = 287, + STR_TACK = 288, + STR_CLICK = 289, + STR_TACKNUM = 290, + STR_BLOOD_OXYGEN = 291, + STR_TRAINING_RECORD = 292, + STR_COMPASS = 293, + STR_PHONE = 294, + STR_FAVORITE_CONTACTS = 295, + STR_WEATHER = 296, + STR_ACTIVITY = 297, + STR_WATCH_FACE = 298, + STR_DISPLAY_MODE = 299, + STR_CARD_MANAGEMENT = 300, + STR_MUSIC = 301, + STR_RECORD = 302, + STR_BREATH_TRAINING = 303, + STR_REMOTE_SHOOTING = 304, + STR_VOICE_ASSISTANT = 305, + STR_ALIPAY = 306, + STR_TIMER = 307, + STR_ALARM = 308, + STR_STOPWATCH = 309, + STR_CALCULATOR = 310, + STR_FIND_PHONE = 311, + STR_BRIGHTNESS_ADJUSTMENT = 312, + STR_SOUND = 313, + STR_BLUETOOTH = 314, + STR_DO_NOT_DISTURB = 315, + STR_MESSAGE_NOTIFICATION = 316, + STR_POWER_SAVE_MODE = 317, + STR_FLASHLIGHT = 318, + STR_SETTINGS = 319, + STR_SCREEN_AND_BRIGHTNESS = 320, + STR_NETWORKANDCALL = 321, + STR_SOUND_AND_VIBRATION = 322, + STR_MOTION_RECOGNITION = 323, + STR_SYSTEM = 324, + STR_SHUTDOWN_AND_RESTART = 325, + STR_SCREEN_ON_DURATION = 326, + STR_RAISE_TO_WAKE = 327, + STR_5_SECONDS = 328, + STR_10_SECONDS = 329, + STR_15_SECONDS = 330, + STR_30_SECONDS = 331, + STR_60_SECONDS = 332, + STR_300_SECONDS = 333, + STR_4G_CAPABILITY = 334, + STR_VOLTE_CALL = 335, + STR_MOBILE_DATA_OPTION = 336, + STR_SYSTEM_UPDATE = 337, + STR_ONLINE_MUSIC = 338, + STR_BLUETOOTH_HEADPHONES = 339, + STR_TRADITIONAL_BLUETOOTH = 340, + STR_AUTO_OFF_BLUETOOTH_NOTE = 341, + STR_BLUETOOTH_SERVICE_OPTIONS = 342, + STR_HFP = 343, + STR_A2DP = 344, + STR_SYSTEM_VOLUME = 345, + STR_MEDIA_VOLUME = 346, + STR_VIBRATION_MODE = 347, + STR_SILENT_MODE = 348, + STR_LIST_DISPLAY = 349, + STR_GRID_DISPLAY = 350, + STR_CELLULAR_DISPLAY = 351, + STR_AUTO_DETECT = 352, + STR_ABOUT_WATCH = 353, + STR_WATCH_QR_CODE = 354, + STR_SYSTEM_LANGUAGE = 355, + STR_RESTART = 356, + STR_SHUTDOWN = 357, + STR_FACTORY_RESET = 358, + STR_WATCH_NAME = 359, + STR_FIRMWARE_VERSION = 360, + STR_BLUETOOTH_NAME = 361, + STR_BLUETOOTH_ADDRESS = 362, + STR_LATEST_VERSION = 363, + STR_UPDATENOW = 364, + STR_LATER = 365, + STR_UP_TO_DATE = 366, + STR_NO_UPDATE = 367, + STR_LANGUAGE_SELECTION = 368, + STR_RESET_CONFIRM = 369, + STR_SHUTDOWN_CONFIRM = 370, + STR_RESET_CONFIRM_NOTE = 371, + STR_RECORDER = 372, + STR_CLICK_TO_RECORD = 373, + STR_RECORDING = 374, + STR_AUDIO_XX = 375, + STR_VOICE_RECORDING_REMINDER = 376, + STR_VOICE_RECORDING_REMINDER_NOTE = 377, + STR_DELETE_RECORDING = 378, + STR_DELETE_PERMANENTLY = 379, + STR_DO_NOT_DISTURB_MODE = 380, + STR_CONNECTION_STATUS = 381, + STR_HEADSET = 382, + STR_CONNECTED = 383, + STR_DISCONNECTED = 384, + STR_PHONE_RINGING_VIBRATING = 385, + STR_BLUETOOTH_DISCONNECTED = 386, + STR_STOP = 387, + STR_WORKDAY = 388, + STR_REPEAT_NO = 389, + STR_EVERYDAY = 390, + STR_ADD_A_NEW_ALARM = 391, + STR_TIME = 392, + STR_NEXT_STEP = 393, + STR_MON = 394, + STR_TUES = 395, + STR_WEDNES = 396, + STR_THURS = 397, + STR_FRI = 398, + STR_SATUR = 399, + STR_SUN = 400, + STR_MONDAY = 401, + STR_TUESDAY = 402, + STR_WEDNESDAY = 403, + STR_THURSDAY = 404, + STR_FRIDAY = 405, + STR_SATURDAY = 406, + STR_SUNDAY = 407, + STR_CALIBRATE_COMPASS = 408, + STR_CALIBRATE_COMPASS_NOTE = 409, + STR_EAST = 410, + STR_SOUTH = 411, + STR_WEST = 412, + STR_NORTH = 413, + STR_SOUTHEAST = 414, + STR_SOUTHWEST = 415, + STR_NORTHEAST = 416, + STR_NORTHWEST = 417, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 418, + STR_EXHALE_NOW = 419, + STR_INHALE_NOW = 420, + STR_TRAINING_COMPLETE = 421, + STR_BREATHING_TRAINING = 422, + STR_THIS_BREATH = 423, + STR_TODAYS_BREATHING_TRAINING = 424, + STR_RECENT_CALLS = 425, + STR_NO_CALLS = 426, + STR_MISSED_CALLS = 427, + STR_DIALED_CALLS = 428, + STR_RECEIVED_CALLS = 429, + STR_NOTE_RECENT_CALLS_LIMITATION = 430, + STR_NO_CONTACTS_ADDED = 431, + STR_DIAL_MODE = 432, + STR_DIAL_VIA_WATCH_SIM = 433, + STR_DIAL_VIA_PHONE = 434, + STR_KUMI_TECHNOLOGY = 435, + STR_CALLING = 436, + STR_NOT_PAIRED = 437, + STR_PAIRED = 438, + STR_UNPAIR = 439, + STR_CONNECTION_ERROR = 440, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 441, + STR_ENABLE_BLUETOOTH_CALL = 442, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 443, + STR_SIM_CARD_ERROR = 444, + STR_CHECK_SIM_CARD_INSERTION = 445, + STR_WEATHER_REPORT = 446, + STR_ULTRAVIOLET = 447, + STR_WIND_SPEED = 448, + STR_HUMIDITY = 449, + STR_NEXT_7_DAYS = 450, + STR_GET_WEATHER_ERROR = 451, + STR_MUSIC_SOURCE = 452, + STR_MOBILE_MUSIC = 453, + STR_WATCH_MUSIC = 454, + STR_MUSIC_LIST = 455, + STR_BLUETOOTH_CONNECTION_FAILED = 456, + STR_SCANNING_BINDING = 457, + STR_DEVICE_BINDING = 458, + STR_DEVICE_BINDING_NOTE = 459, + STR_EQUIPMENT_UNTYING = 460, + STR_EQUIPMENT_UNTYING_NOTE = 461, + STR_DRINK_WATER_REMINDER = 462, + STR_DRINK_WATER_REMINDER_NOTE = 463, + STR_SEDENTARY_REMINDER = 464, + STR_SEDENTARY_REMINDER_NOTE = 465, + STR_SYSTEM_UPGRADING = 466, + STR_NEWDEVICE_BIND_REMIND_NOTE = 467, + STR_TABULAR_DISPLAY = 468, + STR_RECORDING_LIST = 469, + STR_CRLEMPTY = 470, + STR_CALL_VOLUME = 471, + STR_AI_VOICE = 472, + STR_AI_INTELLIGENT_ASSISTANT = 473, + STR_START_CHAT = 474, + STR_BOOT_FAILED = 475, + STR_ENABLE_MOBILE_DATA_FIRST = 476, + STR_ENABLE_BLUETOOTH_FIRST = 477, + STR_LISTENING = 478, + STR_FINISH_SPEAKING = 479, + STR_THINKING = 480, + STR_CANCEL = 481, + STR_CONNECT_TIMEOUT = 482, + STR_PLEASE_RESTART_CHAT = 483, + STR_CONTINUE_CHAT = 484, + STR_MAX_ID = 485, }; // UIResourceTextId enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index ca52a6dc1..224c9cc49 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ