Explorar el Código

1、增加设置时间和日期的功能,同时修改SD8563代码来配合
2、关闭AEM_SET_BT_OPERATE
3、无操作熄屏时间默认为60s,时间选项有调整
4、aem_set_time.c里只保留时间和日期的设置

mohliy hace 3 meses
padre
commit
16fb2522be
Se han modificado 33 ficheros con 1587 adiciones y 921 borrados
  1. BIN
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.enG
  2. BIN
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.res
  3. BIN
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.sty
  4. BIN
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.zhC
  5. 183 180
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/strvalue.txt
  6. 1 1
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/txt/bt_watch_36.txt
  7. 1 1
      application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/txt/bt_watch_36_zhC.txt
  8. BIN
      application/aem_watch/resource/360x360/applist/png/icon/时间日期.png
  9. 175 1
      application/aem_watch/resource/360x360/bt_watch.ui
  10. 180 180
      application/aem_watch/resource/360x360/bt_watch_enG.c
  11. 7 0
      application/aem_watch/resource/360x360/bt_watch_sty.h
  12. 180 180
      application/aem_watch/resource/360x360/bt_watch_zhC.c
  13. 6 0
      application/aem_watch/resource/360x360/res_include.h
  14. 184 181
      application/aem_watch/resource/360x360/res_string_id.c
  15. 141 113
      application/aem_watch/resource/360x360/res_style_bitmap.c
  16. BIN
      application/aem_watch/resource/360x360/set_time_date/日期.png
  17. BIN
      application/aem_watch/resource/360x360/set_time_date/时间.png
  18. BIN
      application/aem_watch/resource/multiLang_translate_table.xls
  19. 2 0
      application/aem_watch/simulator/LVGL.Simulator/LVGL.Simulator.vcxproj
  20. 9 0
      application/aem_watch/simulator/LVGL.Simulator/LVGL.Simulator.vcxproj.filters
  21. 11 4
      application/aem_watch/simulator/LVGL.Simulator/bt_watch_simulator.c
  22. 2 1
      application/aem_watch/src/application/CMakeLists.txt
  23. 1 1
      application/aem_watch/src/application/quick_settings/aem_quick_setting_alarm.c
  24. 8 0
      application/aem_watch/src/application/set_time_date/CMakeLists.txt
  25. 144 0
      application/aem_watch/src/application/set_time_date/aem_set_time_date.c
  26. 75 0
      application/aem_watch/src/application/set_time_date/aem_set_time_date.h
  27. 2 2
      application/aem_watch/src/application/settings/aem_bluetooth.c
  28. 1 1
      application/aem_watch/src/application/settings/aem_bt_operate.c
  29. 248 64
      application/aem_watch/src/application/settings/aem_set_time.c
  30. 2 2
      application/aem_watch/src/user_cfg/data_default_cfg.h
  31. 1 1
      thirdparty/lib/aem/include/aem_activity_id.h
  32. 2 0
      thirdparty/lib/aem/include/aem_app_id.h
  33. 21 8
      zephyr/drivers/input/sd8563_timer_acts.c

BIN
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.enG


BIN
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.res


BIN
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.sty


BIN
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/bt_watch.zhC


+ 183 - 180
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/strvalue.txt

@@ -234,183 +234,186 @@ key_settings_restart_msg 232
 key_settings_ringing_volume 233
 key_settings_scheduled 234
 key_settings_second 235
-key_settings_shortcuts 236
-key_settings_shortcuts_settings 237
-key_settings_sounds 238
-key_settings_start 239
-key_settings_system 240
-key_settings_system_connect_to 241
-key_settings_system_disconnect_t 242
-key_settings_temperature 243
-key_settings_temperature_c 244
-key_settings_temperature_f 245
-key_settings_unit 246
-key_settings_vibration 247
-key_settings_wake_mode 248
-key_settings_watch_imei 249
-key_settings_watch_mac 250
-key_settings_watch_sn 251
-key_settings_watch_version 252
-key_settings_watchface 253
-key_settings_watchface_home 254
-key_setupwizard_connect_failed 255
-key_setupwizard_connect_success 256
-key_setupwizard_connecting 257
-key_setupwizard_download_app 258
-key_setupwizard_language 259
-key_setupwizard_scan_download 260
-key_skip 261
-key_sleep_adequate 262
-key_sleep_awake 263
-key_sleep_deep 264
-key_sleep_doze 265
-key_sleep_duration 266
-key_sleep_hour 267
-key_sleep_min 268
-key_sleep_no_data 269
-key_sleep_quality 270
-key_sleep_rem 271
-key_sleep_score 272
-key_sleep_sleep_score 273
-key_spo2_abnormal 274
-key_spo2_keep_still 275
-key_spo2_low 276
-key_spo2_normal 277
-key_start_wear_watch_tighten 278
-key_start_wear_watch_tips 279
-key_starting 280
-key_stop 281
-key_stress_high 282
-key_stress_level 283
-key_stress_middle 284
-key_stress_normal 285
-key_stress_relax 286
-key_sure 287
-key_temperature 288
-key_timer_customize 289
-key_timer_facial_mask 290
-key_timer_minute 291
-key_timer_pause 292
-key_timer_paused 293
-key_timer_repeat 294
-key_timer_start 295
-key_timer_steamed_egg 296
-key_timer_teeth 297
-key_timer_timing 298
-key_timer_timing_ended 299
-key_tips 300
-key_train_again 301
-key_voice_assistant 302
-key_voice_assistant_wake 303
-key_Wear_the_watch 304
-key_weather_breeze 305
-key_weather_clear_at_night 306
-key_weather_cloudy 307
-key_weather_cloudy_at_night 308
-key_weather_cloudy_to_clear 309
-key_weather_cold 310
-key_weather_connect_tip 311
-key_weather_dust_storm 312
-key_weather_forecast 313
-key_weather_gale 314
-key_weather_hail 315
-key_weather_hot 316
-key_weather_mist 317
-key_weather_open_app 318
-key_weather_other 319
-key_weather_overcast 320
-key_weather_rain 321
-key_weather_rainstorm 322
-key_weather_rainstorm0 323
-key_weather_sand 324
-key_weather_shower 325
-key_weather_snow 326
-key_weather_sunny 327
-key_weather_switch 328
-key_weather_thunder 329
-key_weather_thunderstorm 330
-key_weather_tornado 331
-key_weather_typhoon 332
-key_widget_activity 333
-key_widget_add 334
-key_widget_download_failed 335
-key_widget_explore 336
-key_widget_health 337
-key_widget_in_out_power 338
-key_widget_life 339
-key_widget_measuring 340
-key_widget_profile_photo 341
-key_widget_workout 342
-key_widgets 343
-key_workout_agps_data 344
-key_workout_ai_ahead 345
-key_workout_ai_behind 346
-key_workout_aver_pace 347
-key_workout_aver_step_freq 348
-key_workout_badminton 349
-key_workout_bpm 350
-key_workout_calorie 351
-key_workout_click_to_pause 352
-key_workout_cycle_indoor 353
-key_workout_cycle_outdoor 354
-key_workout_distance 355
-key_workout_distance_unit_km 356
-key_workout_distance_unit_mile 357
-key_workout_duration_end 358
-key_workout_end_confirm 359
-key_workout_exercised 360
-key_workout_goal_settings 361
-key_workout_gps 362
-key_workout_gps_error 363
-key_workout_gps_tips 364
-key_workout_hike 365
-key_workout_hr_max_hr 366
-key_workout_hr_min_hr 367
-key_workout_interval_reminder 368
-key_workout_jump 369
-key_workout_kcal 370
-key_workout_kilocalorie 371
-key_workout_kilometer 372
-key_workout_km 373
-key_workout_km_h 374
-key_workout_km_km 375
-key_workout_manager 376
-key_workout_mi_h 377
-key_workout_mi_mi 378
-key_workout_mile 379
-key_workout_min_min 380
-key_workout_move_open_area 381
-key_workout_moving 382
-key_workout_no_reminder 383
-key_workout_open_goal 384
-key_workout_open_water_swim 385
-key_workout_pace 386
-key_workout_pause 387
-key_workout_pool_length 388
-key_workout_pool_swim 389
-key_workout_positioning_failed 390
-key_workout_positioning_successf 391
-key_workout_recent_sports 392
-key_workout_repositioning 393
-key_workout_rope_skipping 394
-key_workout_run_indoor 395
-key_workout_run_outdoor 396
-key_workout_settings 397
-key_workout_settings_auto_pause 398
-key_workout_settings_auto_recogn 399
-key_workout_settings_hr_tips 400
-key_workout_settings_hr_warning 401
-key_workout_settings_hr_warningl 402
-key_workout_skip 403
-key_workout_speed 404
-key_workout_spm 405
-key_workout_start 406
-key_workout_step_frequency 407
-key_workout_steps 408
-key_workout_steps_steps 409
-key_workout_tennis 410
-key_workout_time 411
-key_workout_unit_pcs 412
-key_workout_wait 413
-key_workout_yd 414
-key_workout_yoga 415
+key_settings_set_date 236
+key_settings_set_time 237
+key_settings_set_time_date 238
+key_settings_shortcuts 239
+key_settings_shortcuts_settings 240
+key_settings_sounds 241
+key_settings_start 242
+key_settings_system 243
+key_settings_system_connect_to 244
+key_settings_system_disconnect_t 245
+key_settings_temperature 246
+key_settings_temperature_c 247
+key_settings_temperature_f 248
+key_settings_unit 249
+key_settings_vibration 250
+key_settings_wake_mode 251
+key_settings_watch_imei 252
+key_settings_watch_mac 253
+key_settings_watch_sn 254
+key_settings_watch_version 255
+key_settings_watchface 256
+key_settings_watchface_home 257
+key_setupwizard_connect_failed 258
+key_setupwizard_connect_success 259
+key_setupwizard_connecting 260
+key_setupwizard_download_app 261
+key_setupwizard_language 262
+key_setupwizard_scan_download 263
+key_skip 264
+key_sleep_adequate 265
+key_sleep_awake 266
+key_sleep_deep 267
+key_sleep_doze 268
+key_sleep_duration 269
+key_sleep_hour 270
+key_sleep_min 271
+key_sleep_no_data 272
+key_sleep_quality 273
+key_sleep_rem 274
+key_sleep_score 275
+key_sleep_sleep_score 276
+key_spo2_abnormal 277
+key_spo2_keep_still 278
+key_spo2_low 279
+key_spo2_normal 280
+key_start_wear_watch_tighten 281
+key_start_wear_watch_tips 282
+key_starting 283
+key_stop 284
+key_stress_high 285
+key_stress_level 286
+key_stress_middle 287
+key_stress_normal 288
+key_stress_relax 289
+key_sure 290
+key_temperature 291
+key_timer_customize 292
+key_timer_facial_mask 293
+key_timer_minute 294
+key_timer_pause 295
+key_timer_paused 296
+key_timer_repeat 297
+key_timer_start 298
+key_timer_steamed_egg 299
+key_timer_teeth 300
+key_timer_timing 301
+key_timer_timing_ended 302
+key_tips 303
+key_train_again 304
+key_voice_assistant 305
+key_voice_assistant_wake 306
+key_Wear_the_watch 307
+key_weather_breeze 308
+key_weather_clear_at_night 309
+key_weather_cloudy 310
+key_weather_cloudy_at_night 311
+key_weather_cloudy_to_clear 312
+key_weather_cold 313
+key_weather_connect_tip 314
+key_weather_dust_storm 315
+key_weather_forecast 316
+key_weather_gale 317
+key_weather_hail 318
+key_weather_hot 319
+key_weather_mist 320
+key_weather_open_app 321
+key_weather_other 322
+key_weather_overcast 323
+key_weather_rain 324
+key_weather_rainstorm 325
+key_weather_rainstorm0 326
+key_weather_sand 327
+key_weather_shower 328
+key_weather_snow 329
+key_weather_sunny 330
+key_weather_switch 331
+key_weather_thunder 332
+key_weather_thunderstorm 333
+key_weather_tornado 334
+key_weather_typhoon 335
+key_widget_activity 336
+key_widget_add 337
+key_widget_download_failed 338
+key_widget_explore 339
+key_widget_health 340
+key_widget_in_out_power 341
+key_widget_life 342
+key_widget_measuring 343
+key_widget_profile_photo 344
+key_widget_workout 345
+key_widgets 346
+key_workout_agps_data 347
+key_workout_ai_ahead 348
+key_workout_ai_behind 349
+key_workout_aver_pace 350
+key_workout_aver_step_freq 351
+key_workout_badminton 352
+key_workout_bpm 353
+key_workout_calorie 354
+key_workout_click_to_pause 355
+key_workout_cycle_indoor 356
+key_workout_cycle_outdoor 357
+key_workout_distance 358
+key_workout_distance_unit_km 359
+key_workout_distance_unit_mile 360
+key_workout_duration_end 361
+key_workout_end_confirm 362
+key_workout_exercised 363
+key_workout_goal_settings 364
+key_workout_gps 365
+key_workout_gps_error 366
+key_workout_gps_tips 367
+key_workout_hike 368
+key_workout_hr_max_hr 369
+key_workout_hr_min_hr 370
+key_workout_interval_reminder 371
+key_workout_jump 372
+key_workout_kcal 373
+key_workout_kilocalorie 374
+key_workout_kilometer 375
+key_workout_km 376
+key_workout_km_h 377
+key_workout_km_km 378
+key_workout_manager 379
+key_workout_mi_h 380
+key_workout_mi_mi 381
+key_workout_mile 382
+key_workout_min_min 383
+key_workout_move_open_area 384
+key_workout_moving 385
+key_workout_no_reminder 386
+key_workout_open_goal 387
+key_workout_open_water_swim 388
+key_workout_pace 389
+key_workout_pause 390
+key_workout_pool_length 391
+key_workout_pool_swim 392
+key_workout_positioning_failed 393
+key_workout_positioning_successf 394
+key_workout_recent_sports 395
+key_workout_repositioning 396
+key_workout_rope_skipping 397
+key_workout_run_indoor 398
+key_workout_run_outdoor 399
+key_workout_settings 400
+key_workout_settings_auto_pause 401
+key_workout_settings_auto_recogn 402
+key_workout_settings_hr_tips 403
+key_workout_settings_hr_warning 404
+key_workout_settings_hr_warningl 405
+key_workout_skip 406
+key_workout_speed 407
+key_workout_spm 408
+key_workout_start 409
+key_workout_step_frequency 410
+key_workout_steps 411
+key_workout_steps_steps 412
+key_workout_tennis 413
+key_workout_time 414
+key_workout_unit_pcs 415
+key_workout_wait 416
+key_workout_yd 417
+key_workout_yoga 418

+ 1 - 1
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/txt/bt_watch_36.txt

@@ -1 +1 @@
-0X20-0X77,0X78,0X79,0X7A,0XE1,0XE2,0XE3,0XE4,0XE7,0XE8,0XE9,0XEA,0XED,0XF1,0XF3,0XF4,0XF5,0XF6,0XFA,0XFC,0X107,0X119,0X11F,0X131,0X142,0X15B,0X15F,0X411,0X413,0X414,0X415,0X416,0X417,0X41A,0X41C,0X41D,0X41F,0X421,0X422,0X423,0X424,0X427,0X430,0X432,0X433,0X434,0X435,0X436,0X437,0X438,0X439,0X43A,0X43B,0X43C,0X43D,0X43E,0X43F,0X440,0X441,0X442,0X443,0X444,0X445,0X447,0X449,0X44B,0X44C,0X44F,0X5D0,0X5D1,0X5D2,0X5D3,0X5D4,0X5D5,0X5D6,0X5D7,0X5D8,0X5D9,0X5DC,0X5DD,0X5DE,0X5DF,0X5E0,0X5E1,0X5E2,0X5E4,0X5E5,0X5E6,0X5E7,0X5E8,0X5E9,0X5EA,0X623,0X625,0X627,0X628,0X629,0X62A,0X62B,0X62C,0X62D,0X62E,0X62F,0X631,0X632,0X633,0X634,0X635,0X636,0X637,0X638,0X639,0X63A,0X641,0X642,0X643,0X644,0X645,0X646,0X647,0X648,0X649,0X64A,0X686,0X698,0X6A9,0X6AF,0X6CC,0X200C,0X4E50,0X5065,0X50CF,0X5165,0X51FA,0X529B,0X529F,0X52A8,0X52A9,0X5357,0X5386,0X538B,0X5438,0X547C,0X5668,0X56FE,0X5929,0X5934,0X5973,0X5E38,0X5EB7,0X5F55,0X5FC3,0X6027,0X624B,0X627E,0X6307,0X65E5,0X65F6,0X673A,0X6C14,0X6C27,0X6D3B,0X7247,0X7387,0X7535,0X76F8,0X7720,0X7761,0X79D2,0X7B52,0X7B97,0X7F6E,0X8017,0X8840,0X8868,0X8BA1,0X8BB0,0X8BBE,0X8BDD,0X8BED,0X8F93,0X8FD0,0X9488,0X949F,0X95F9,0X97F3
+0X20-0X77,0X78,0X79,0X7A,0XE1,0XE2,0XE3,0XE4,0XE7,0XE8,0XE9,0XEA,0XED,0XF1,0XF3,0XF4,0XF5,0XF6,0XFA,0XFC,0X107,0X119,0X11F,0X131,0X142,0X15B,0X15F,0X411,0X413,0X414,0X415,0X416,0X417,0X41A,0X41C,0X41D,0X41F,0X421,0X422,0X423,0X424,0X427,0X430,0X432,0X433,0X434,0X435,0X436,0X437,0X438,0X439,0X43A,0X43B,0X43C,0X43D,0X43E,0X43F,0X440,0X441,0X442,0X443,0X444,0X445,0X447,0X449,0X44B,0X44C,0X44F,0X5D0,0X5D1,0X5D2,0X5D3,0X5D4,0X5D5,0X5D6,0X5D7,0X5D8,0X5D9,0X5DC,0X5DD,0X5DE,0X5DF,0X5E0,0X5E1,0X5E2,0X5E4,0X5E5,0X5E6,0X5E7,0X5E8,0X5E9,0X5EA,0X623,0X625,0X627,0X628,0X629,0X62A,0X62B,0X62C,0X62D,0X62E,0X62F,0X631,0X632,0X633,0X634,0X635,0X636,0X637,0X638,0X639,0X63A,0X641,0X642,0X643,0X644,0X645,0X646,0X647,0X648,0X649,0X64A,0X686,0X698,0X6A9,0X6AF,0X6CC,0X200C,0X4E50,0X5065,0X50CF,0X5165,0X51FA,0X529B,0X529F,0X52A8,0X52A9,0X5357,0X5386,0X538B,0X5438,0X547C,0X5668,0X56FE,0X5929,0X5934,0X5973,0X5E38,0X5EB7,0X5F55,0X5FC3,0X6027,0X624B,0X627E,0X6307,0X65E5,0X65F6,0X671F,0X673A,0X6C14,0X6C27,0X6D3B,0X7247,0X7387,0X7535,0X76F8,0X7720,0X7761,0X79D2,0X7B52,0X7B97,0X7F6E,0X8017,0X8840,0X8868,0X8BA1,0X8BB0,0X8BBE,0X8BDD,0X8BED,0X8F93,0X8FD0,0X9488,0X949F,0X95F4,0X95F9,0X97F3

+ 1 - 1
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/txt/bt_watch_36_zhC.txt

@@ -1 +1 @@
-,0X4E50,0X5065,0X50CF,0X5165,0X51FA,0X529B,0X529F,0X52A8,0X52A9,0X5357,0X5386,0X538B,0X5438,0X547C,0X5668,0X56FE,0X5929,0X5934,0X5973,0X5E38,0X5EB7,0X5F55,0X5FC3,0X6027,0X624B,0X627E,0X6307,0X65E5,0X65F6,0X673A,0X6C14,0X6C27,0X6D3B,0X7247,0X7387,0X7535,0X76F8,0X7720,0X7761,0X79D2,0X7B52,0X7B97,0X7F6E,0X8017,0X8840,0X8868,0X8BA1,0X8BB0,0X8BBE,0X8BDD,0X8BED,0X8F93,0X8FD0,0X9488,0X949F,0X95F9,0X97F3
+,0X4E50,0X5065,0X50CF,0X5165,0X51FA,0X529B,0X529F,0X52A8,0X52A9,0X5357,0X5386,0X538B,0X5438,0X547C,0X5668,0X56FE,0X5929,0X5934,0X5973,0X5E38,0X5EB7,0X5F55,0X5FC3,0X6027,0X624B,0X627E,0X6307,0X65E5,0X65F6,0X671F,0X673A,0X6C14,0X6C27,0X6D3B,0X7247,0X7387,0X7535,0X76F8,0X7720,0X7761,0X79D2,0X7B52,0X7B97,0X7F6E,0X8017,0X8840,0X8868,0X8BA1,0X8BB0,0X8BBE,0X8BDD,0X8BED,0X8F93,0X8FD0,0X9488,0X949F,0X95F4,0X95F9,0X97F3

BIN
application/aem_watch/resource/360x360/applist/png/icon/时间日期.png


+ 175 - 1
application/aem_watch/resource/360x360/bt_watch.ui

@@ -1354,7 +1354,7 @@
                 <element class="picture_resource">
                     <property name="name" value="pic_icon" />
                     <property name="id" value="32971" />
-                    <property name="x" value="0x0000" />
+                    <property name="x" value="0x011b" />
                     <property name="y" value="0x0007" />
                     <property name="width" value="0x004a" />
                     <property name="height" value="0x004a" />
@@ -1414,6 +1414,53 @@
                     <property name="strid" value="key_voice_assistant" />
                 </element>
             </element>
+            <element class="resgroup_resource">
+                <property name="name" value="res_set_time_date" />
+                <property name="id" value="33294" />
+                <property name="x" value="0x0000" />
+                <property name="y" value="0x0000" />
+                <property name="width" value="0x0014" />
+                <property name="height" value="0x0014" />
+                <property name="background" value="0x00c8c8c8" />
+                <property name="opaque" value="0x0000" />
+                <property name="transparency" value="0x00ff" />
+                <property name="visible" value="0x0001" />
+                <property name="editable" value="1" />
+                <element class="picture_resource">
+                    <property name="name" value="pic_icon" />
+                    <property name="id" value="33295" />
+                    <property name="x" value="0x0000" />
+                    <property name="y" value="0x0000" />
+                    <property name="width" value="0x004a" />
+                    <property name="height" value="0x004a" />
+                    <property name="visible" value="0x0011" />
+                    <property name="compress" value="0x0000" />
+                    <property name="PNG_A8" value="0x0000" />
+                    <property name="ARGB" value="0x0000" />
+                    <element class="layer">
+                        <property name="0" value=".\applist\png\icon\时间日期.png" />
+                    </element>
+                </element>
+                <element class="string_resource">
+                    <property name="name" value="str_text" />
+                    <property name="id" value="33296" />
+                    <property name="x" value="0x0064" />
+                    <property name="y" value="0x0000" />
+                    <property name="width" value="0x0064" />
+                    <property name="height" value="0x0024" />
+                    <property name="foreground" value="0x00ffffff" />
+                    <property name="background" value="0x00000000" />
+                    <property name="visible" value="0x0001" />
+                    <property name="align" value="0x000e" />
+                    <property name="mode" value="0x0002" />
+                    <property name="size" value="0x0024" />
+                    <property name="scroll" value="0x0" />
+                    <property name="direction" value="-1" />
+                    <property name="space" value="0x0064" />
+                    <property name="pixel" value="0x0001" />
+                    <property name="strid" value="key_settings_set_time_date" />
+                </element>
+            </element>
         </element>
     </scene>
     <scene>
@@ -21699,6 +21746,127 @@
             </element>
         </element>
     </scene>
+    <scene>
+        <property name="name" value="SCENE_SET_TIME_DATE" />
+        <property name="id" value="33286" />
+        <property name="direction" value="0" />
+        <property name="key1" value="1" />
+        <property name="key2" value="2" />
+        <property name="key3" value="3" />
+        <property name="key4" value="4" />
+        <property name="key5" value="5" />
+        <property name="key6" value="6" />
+        <property name="key7" value="7" />
+        <property name="key8" value="8" />
+        <property name="key9" value="9" />
+        <property name="key10" value="10" />
+        <property name="key11" value="11" />
+        <property name="key12" value="12" />
+        <property name="key13" value="13" />
+        <property name="key14" value="14" />
+        <property name="key15" value="15" />
+        <property name="key16" value="16" />
+        <element class="resgroup_resource">
+            <property name="name" value="window" />
+            <property name="id" value="33287" />
+            <property name="x" value="0x0000" />
+            <property name="y" value="0x0000" />
+            <property name="width" value="0x0168" />
+            <property name="height" value="0x0168" />
+            <property name="background" value="0x00c8c8c8" />
+            <property name="opaque" value="0x0000" />
+            <property name="transparency" value="0x00ff" />
+            <property name="visible" value="0x0001" />
+            <property name="editable" value="1" />
+            <element class="picture_resource">
+                <property name="name" value="PIC_SET_TIME" />
+                <property name="id" value="33288" />
+                <property name="x" value="0x0031" />
+                <property name="y" value="0x005c" />
+                <property name="width" value="0x003c" />
+                <property name="height" value="0x003c" />
+                <property name="visible" value="0x0011" />
+                <property name="compress" value="0x0000" />
+                <property name="PNG_A8" value="0x0000" />
+                <property name="ARGB" value="0x0000" />
+                <element class="layer">
+                    <property name="0" value=".\set_time_date\时间.png" />
+                </element>
+            </element>
+            <element class="picture_resource">
+                <property name="name" value="PIC_SET_DATE" />
+                <property name="id" value="33290" />
+                <property name="x" value="0x0031" />
+                <property name="y" value="0x00ad" />
+                <property name="width" value="0x003c" />
+                <property name="height" value="0x003c" />
+                <property name="visible" value="0x0011" />
+                <property name="compress" value="0x0000" />
+                <property name="PNG_A8" value="0x0000" />
+                <property name="ARGB" value="0x0000" />
+                <element class="layer">
+                    <property name="0" value=".\set_time_date\日期.png" />
+                </element>
+            </element>
+            <element class="string_resource">
+                <property name="name" value="str_set_time_date" />
+                <property name="id" value="33291" />
+                <property name="x" value="0x0082" />
+                <property name="y" value="0x003b" />
+                <property name="width" value="0x0064" />
+                <property name="height" value="0x0014" />
+                <property name="foreground" value="0x00000000" />
+                <property name="background" value="0x00ffffff" />
+                <property name="visible" value="0x0001" />
+                <property name="align" value="0x000e" />
+                <property name="mode" value="0x0002" />
+                <property name="size" value="0x000c" />
+                <property name="scroll" value="0x0" />
+                <property name="direction" value="-1" />
+                <property name="space" value="0x0064" />
+                <property name="pixel" value="0x0001" />
+                <property name="strid" value="key_settings_set_time_date" />
+            </element>
+            <element class="string_resource">
+                <property name="name" value="str_set_time" />
+                <property name="id" value="33292" />
+                <property name="x" value="0x007d" />
+                <property name="y" value="0x0070" />
+                <property name="width" value="0x0064" />
+                <property name="height" value="0x0014" />
+                <property name="foreground" value="0x00000000" />
+                <property name="background" value="0x00ffffff" />
+                <property name="visible" value="0x0001" />
+                <property name="align" value="0x000e" />
+                <property name="mode" value="0x0002" />
+                <property name="size" value="0x000c" />
+                <property name="scroll" value="0x0" />
+                <property name="direction" value="-1" />
+                <property name="space" value="0x0064" />
+                <property name="pixel" value="0x0001" />
+                <property name="strid" value="key_settings_set_time" />
+            </element>
+            <element class="string_resource">
+                <property name="name" value="str_set_date" />
+                <property name="id" value="33293" />
+                <property name="x" value="0x0086" />
+                <property name="y" value="0x00c2" />
+                <property name="width" value="0x0064" />
+                <property name="height" value="0x0014" />
+                <property name="foreground" value="0x00000000" />
+                <property name="background" value="0x00ffffff" />
+                <property name="visible" value="0x0001" />
+                <property name="align" value="0x000e" />
+                <property name="mode" value="0x0002" />
+                <property name="size" value="0x000c" />
+                <property name="scroll" value="0x0" />
+                <property name="direction" value="-1" />
+                <property name="space" value="0x0064" />
+                <property name="pixel" value="0x0001" />
+                <property name="strid" value="key_settings_set_date" />
+            </element>
+        </element>
+    </scene>
     <resource>
         <picture value=".\blood_pressure\number\0.png" />
         <picture value=".\blood_pressure\number\1.png" />
@@ -22469,6 +22637,9 @@
         <picture value=".\settings\bluetooth\连接新手机.png" />
         <picture value=".\logo\catsights_white.png" />
         <picture value=".\logo\catsights_logo.png" />
+        <picture value=".\set_time_date\时间.png" />
+        <picture value=".\set_time_date\日期.png" />
+        <picture value=".\applist\png\icon\时间日期.png" />
         <txt value="..\multilang_translate_table.xls" />
         <string value="key_setupwizard_language" />
         <string value="key_setupwizard_download_app" />
@@ -23062,5 +23233,8 @@
         <string value="key_workout_social_dance" />
         <string value="key_widget_in_out_power" />
         <string value="key_widget_profile_photo" />
+        <string value="key_settings_set_time_date" />
+        <string value="key_settings_set_time" />
+        <string value="key_settings_set_date" />
     </resource>
 </ui-rad>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 180 - 180
application/aem_watch/resource/360x360/bt_watch_enG.c


+ 7 - 0
application/aem_watch/resource/360x360/bt_watch_sty.h

@@ -36,6 +36,7 @@
 #define  RES_DRAG_TRACK    0xed5f5713
 #define  RES_AI_VOICE    0x92c3b0b8
 #define  RES_RECORDER    0x2be6d1a7
+#define  RES_SET_TIME_DATE    0x1de9d9d8
 #define  SCENE_WORKOUT    0x7d6da2dc
 #define  PIC_WORKOUT_BG    0x256e75ce
 #define  PIC_ROUND_BG    0x49fd00dd
@@ -1078,6 +1079,12 @@
 #define  STATISTIC_SLEEP_TIPS    0x7d377963
 #define  SCENE_SHOW_LOGO    0x3a2de11a
 #define  PIC_APP_LOGO    0xf52a384a
+#define  SCENE_SET_TIME_DATE    0x2e3ca75e
+#define  PIC_SET_TIME    0x1041fce7
+#define  PIC_SET_DATE    0x6c00e7e0
+#define  STR_SET_TIME_DATE    0x61769b87
+#define  STR_SET_TIME    0x7cd1484
+#define  STR_SET_DATE    0x2f38573b
 #define  STR_BT_CONNECT_MORE    0xad6733b
 #define  STR_BT_BLUETOOTH    0x2c134409
 #define  SCENE_RECORDER    0x348a22e9

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 180 - 180
application/aem_watch/resource/360x360/bt_watch_zhC.c


+ 6 - 0
application/aem_watch/resource/360x360/res_include.h

@@ -31,6 +31,7 @@ extern lv_img_dsc_t IMG_SCENE_APPLIST_RES_BAROMETER_PIC_ICON;
 extern lv_img_dsc_t IMG_SCENE_APPLIST_RES_LAUNCH_PIC_ICON; 
 extern lv_img_dsc_t IMG_SCENE_APPLIST_RES_AI_VOICE_PIC_ICON; 
 extern lv_img_dsc_t IMG_SCENE_APPLIST_RES_RECORDER_PIC_ICON; 
+extern lv_img_dsc_t IMG_SCENE_APPLIST_RES_SET_TIME_DATE_PIC_ICON; 
 extern lv_img_dsc_t IMG_SCENE_WORKOUT_PIC_WORKOUT_BG; 
 extern lv_img_dsc_t IMG_SCENE_WORKOUT_PIC_ROUND_BG; 
 extern lv_img_dsc_t IMG_SCENE_WORKOUT_PIC_OUTDOOR_RUNNING; 
@@ -679,6 +680,8 @@ extern lv_img_dsc_t IMG_SCENE_WXPAY_PIC_WECHAT_PAY;
 extern lv_img_dsc_t IMG_SCENE_POWER_PIC_BOOT_LOGO; 
 extern lv_img_dsc_t IMG_SCENE_NINI_CHARGER_PIC_MINI_CHAR_BG; 
 extern lv_img_dsc_t IMG_SCENE_SHOW_LOGO_PIC_APP_LOGO; 
+extern lv_img_dsc_t IMG_SCENE_SET_TIME_DATE_PIC_SET_TIME; 
+extern lv_img_dsc_t IMG_SCENE_SET_TIME_DATE_PIC_SET_DATE; 
 
 typedef enum{ 
 	ID_KEY_OTA_DOWNLOADING,
@@ -918,6 +921,9 @@ typedef enum{
 	ID_KEY_SETTINGS_RINGING_VOLUME,
 	ID_KEY_SETTINGS_SCHEDULED,
 	ID_KEY_SETTINGS_SECOND,
+	ID_KEY_SETTINGS_SET_DATE,
+	ID_KEY_SETTINGS_SET_TIME,
+	ID_KEY_SETTINGS_SET_TIME_DATE,
 	ID_KEY_SETTINGS_SHORTCUTS,
 	ID_KEY_SETTINGS_SHORTCUTS_SETTINGS,
 	ID_KEY_SETTINGS_SOUNDS,

+ 184 - 181
application/aem_watch/resource/360x360/res_string_id.c

@@ -1,10 +1,10 @@
 #include <res_manager_api.h>
 
-res_string_item_t RES_STRING_ID_DIC[417] = {
+res_string_item_t RES_STRING_ID_DIC[420] = {
 		{.key = NULL,		.value = 0},
 		{.key = "key_OTA_downloading",		.value = 181},
 		{.key = "key_OTA_failed",		.value = 182},
-		{.key = "key_Wear_the_watch",		.value = 305},
+		{.key = "key_Wear_the_watch",		.value = 308},
 		{.key = "key_activity_calorie_goal",		.value = 1},
 		{.key = "key_activity_calorie_unit",		.value = 2},
 		{.key = "key_activity_duration_goal",		.value = 3},
@@ -239,183 +239,186 @@ res_string_item_t RES_STRING_ID_DIC[417] = {
 		{.key = "key_settings_ringing_volume",		.value = 234},
 		{.key = "key_settings_scheduled",		.value = 235},
 		{.key = "key_settings_second",		.value = 236},
-		{.key = "key_settings_shortcuts",		.value = 237},
-		{.key = "key_settings_shortcuts_settings",		.value = 238},
-		{.key = "key_settings_sounds",		.value = 239},
-		{.key = "key_settings_start",		.value = 240},
-		{.key = "key_settings_system",		.value = 241},
-		{.key = "key_settings_system_connect_to",		.value = 242},
-		{.key = "key_settings_system_disconnect_t",		.value = 243},
-		{.key = "key_settings_temperature",		.value = 244},
-		{.key = "key_settings_temperature_c",		.value = 245},
-		{.key = "key_settings_temperature_f",		.value = 246},
-		{.key = "key_settings_unit",		.value = 247},
-		{.key = "key_settings_vibration",		.value = 248},
-		{.key = "key_settings_wake_mode",		.value = 249},
-		{.key = "key_settings_watch_imei",		.value = 250},
-		{.key = "key_settings_watch_mac",		.value = 251},
-		{.key = "key_settings_watch_sn",		.value = 252},
-		{.key = "key_settings_watch_version",		.value = 253},
-		{.key = "key_settings_watchface",		.value = 254},
-		{.key = "key_settings_watchface_home",		.value = 255},
-		{.key = "key_setupwizard_connect_failed",		.value = 256},
-		{.key = "key_setupwizard_connect_success",		.value = 257},
-		{.key = "key_setupwizard_connecting",		.value = 258},
-		{.key = "key_setupwizard_download_app",		.value = 259},
-		{.key = "key_setupwizard_language",		.value = 260},
-		{.key = "key_setupwizard_scan_download",		.value = 261},
-		{.key = "key_skip",		.value = 262},
-		{.key = "key_sleep_adequate",		.value = 263},
-		{.key = "key_sleep_awake",		.value = 264},
-		{.key = "key_sleep_deep",		.value = 265},
-		{.key = "key_sleep_doze",		.value = 266},
-		{.key = "key_sleep_duration",		.value = 267},
-		{.key = "key_sleep_hour",		.value = 268},
-		{.key = "key_sleep_min",		.value = 269},
-		{.key = "key_sleep_no_data",		.value = 270},
-		{.key = "key_sleep_quality",		.value = 271},
-		{.key = "key_sleep_rem",		.value = 272},
-		{.key = "key_sleep_score",		.value = 273},
-		{.key = "key_sleep_sleep_score",		.value = 274},
-		{.key = "key_spo2_abnormal",		.value = 275},
-		{.key = "key_spo2_keep_still",		.value = 276},
-		{.key = "key_spo2_low",		.value = 277},
-		{.key = "key_spo2_normal",		.value = 278},
-		{.key = "key_start_wear_watch_tighten",		.value = 279},
-		{.key = "key_start_wear_watch_tips",		.value = 280},
-		{.key = "key_starting",		.value = 281},
-		{.key = "key_stop",		.value = 282},
-		{.key = "key_stress_high",		.value = 283},
-		{.key = "key_stress_level",		.value = 284},
-		{.key = "key_stress_middle",		.value = 285},
-		{.key = "key_stress_normal",		.value = 286},
-		{.key = "key_stress_relax",		.value = 287},
-		{.key = "key_sure",		.value = 288},
-		{.key = "key_temperature",		.value = 289},
-		{.key = "key_timer_customize",		.value = 290},
-		{.key = "key_timer_facial_mask",		.value = 291},
-		{.key = "key_timer_minute",		.value = 292},
-		{.key = "key_timer_pause",		.value = 293},
-		{.key = "key_timer_paused",		.value = 294},
-		{.key = "key_timer_repeat",		.value = 295},
-		{.key = "key_timer_start",		.value = 296},
-		{.key = "key_timer_steamed_egg",		.value = 297},
-		{.key = "key_timer_teeth",		.value = 298},
-		{.key = "key_timer_timing",		.value = 299},
-		{.key = "key_timer_timing_ended",		.value = 300},
-		{.key = "key_tips",		.value = 301},
-		{.key = "key_train_again",		.value = 302},
-		{.key = "key_voice_assistant",		.value = 303},
-		{.key = "key_voice_assistant_wake",		.value = 304},
-		{.key = "key_weather_breeze",		.value = 306},
-		{.key = "key_weather_clear_at_night",		.value = 307},
-		{.key = "key_weather_cloudy",		.value = 308},
-		{.key = "key_weather_cloudy_at_night",		.value = 309},
-		{.key = "key_weather_cloudy_to_clear",		.value = 310},
-		{.key = "key_weather_cold",		.value = 311},
-		{.key = "key_weather_connect_tip",		.value = 312},
-		{.key = "key_weather_dust_storm",		.value = 313},
-		{.key = "key_weather_forecast",		.value = 314},
-		{.key = "key_weather_gale",		.value = 315},
-		{.key = "key_weather_hail",		.value = 316},
-		{.key = "key_weather_hot",		.value = 317},
-		{.key = "key_weather_mist",		.value = 318},
-		{.key = "key_weather_open_app",		.value = 319},
-		{.key = "key_weather_other",		.value = 320},
-		{.key = "key_weather_overcast",		.value = 321},
-		{.key = "key_weather_rain",		.value = 322},
-		{.key = "key_weather_rainstorm",		.value = 323},
-		{.key = "key_weather_rainstorm0",		.value = 324},
-		{.key = "key_weather_sand",		.value = 325},
-		{.key = "key_weather_shower",		.value = 326},
-		{.key = "key_weather_snow",		.value = 327},
-		{.key = "key_weather_sunny",		.value = 328},
-		{.key = "key_weather_switch",		.value = 329},
-		{.key = "key_weather_thunder",		.value = 330},
-		{.key = "key_weather_thunderstorm",		.value = 331},
-		{.key = "key_weather_tornado",		.value = 332},
-		{.key = "key_weather_typhoon",		.value = 333},
-		{.key = "key_widget_activity",		.value = 334},
-		{.key = "key_widget_add",		.value = 335},
-		{.key = "key_widget_download_failed",		.value = 336},
-		{.key = "key_widget_explore",		.value = 337},
-		{.key = "key_widget_health",		.value = 338},
-		{.key = "key_widget_in_out_power",		.value = 339},
-		{.key = "key_widget_life",		.value = 340},
-		{.key = "key_widget_measuring",		.value = 341},
-		{.key = "key_widget_profile_photo",		.value = 342},
-		{.key = "key_widget_workout",		.value = 343},
-		{.key = "key_widgets",		.value = 344},
-		{.key = "key_workout_agps_data",		.value = 345},
-		{.key = "key_workout_ai_ahead",		.value = 346},
-		{.key = "key_workout_ai_behind",		.value = 347},
-		{.key = "key_workout_aver_pace",		.value = 348},
-		{.key = "key_workout_aver_step_freq",		.value = 349},
-		{.key = "key_workout_badminton",		.value = 350},
-		{.key = "key_workout_bpm",		.value = 351},
-		{.key = "key_workout_calorie",		.value = 352},
-		{.key = "key_workout_click_to_pause",		.value = 353},
-		{.key = "key_workout_cycle_indoor",		.value = 354},
-		{.key = "key_workout_cycle_outdoor",		.value = 355},
-		{.key = "key_workout_distance",		.value = 356},
-		{.key = "key_workout_distance_unit_km",		.value = 357},
-		{.key = "key_workout_distance_unit_mile",		.value = 358},
-		{.key = "key_workout_duration_end",		.value = 359},
-		{.key = "key_workout_end_confirm",		.value = 360},
-		{.key = "key_workout_exercised",		.value = 361},
-		{.key = "key_workout_goal_settings",		.value = 362},
-		{.key = "key_workout_gps",		.value = 363},
-		{.key = "key_workout_gps_error",		.value = 364},
-		{.key = "key_workout_gps_tips",		.value = 365},
-		{.key = "key_workout_hike",		.value = 366},
-		{.key = "key_workout_hr_max_hr",		.value = 367},
-		{.key = "key_workout_hr_min_hr",		.value = 368},
-		{.key = "key_workout_interval_reminder",		.value = 369},
-		{.key = "key_workout_jump",		.value = 370},
-		{.key = "key_workout_kcal",		.value = 371},
-		{.key = "key_workout_kilocalorie",		.value = 372},
-		{.key = "key_workout_kilometer",		.value = 373},
-		{.key = "key_workout_km",		.value = 374},
-		{.key = "key_workout_km_h",		.value = 375},
-		{.key = "key_workout_km_km",		.value = 376},
-		{.key = "key_workout_manager",		.value = 377},
-		{.key = "key_workout_mi_h",		.value = 378},
-		{.key = "key_workout_mi_mi",		.value = 379},
-		{.key = "key_workout_mile",		.value = 380},
-		{.key = "key_workout_min_min",		.value = 381},
-		{.key = "key_workout_move_open_area",		.value = 382},
-		{.key = "key_workout_moving",		.value = 383},
-		{.key = "key_workout_no_reminder",		.value = 384},
-		{.key = "key_workout_open_goal",		.value = 385},
-		{.key = "key_workout_open_water_swim",		.value = 386},
-		{.key = "key_workout_pace",		.value = 387},
-		{.key = "key_workout_pause",		.value = 388},
-		{.key = "key_workout_pool_length",		.value = 389},
-		{.key = "key_workout_pool_swim",		.value = 390},
-		{.key = "key_workout_positioning_failed",		.value = 391},
-		{.key = "key_workout_positioning_successf",		.value = 392},
-		{.key = "key_workout_recent_sports",		.value = 393},
-		{.key = "key_workout_repositioning",		.value = 394},
-		{.key = "key_workout_rope_skipping",		.value = 395},
-		{.key = "key_workout_run_indoor",		.value = 396},
-		{.key = "key_workout_run_outdoor",		.value = 397},
-		{.key = "key_workout_settings",		.value = 398},
-		{.key = "key_workout_settings_auto_pause",		.value = 399},
-		{.key = "key_workout_settings_auto_recogn",		.value = 400},
-		{.key = "key_workout_settings_hr_tips",		.value = 401},
-		{.key = "key_workout_settings_hr_warning",		.value = 402},
-		{.key = "key_workout_settings_hr_warningl",		.value = 403},
-		{.key = "key_workout_skip",		.value = 404},
-		{.key = "key_workout_speed",		.value = 405},
-		{.key = "key_workout_spm",		.value = 406},
-		{.key = "key_workout_start",		.value = 407},
-		{.key = "key_workout_step_frequency",		.value = 408},
-		{.key = "key_workout_steps",		.value = 409},
-		{.key = "key_workout_steps_steps",		.value = 410},
-		{.key = "key_workout_tennis",		.value = 411},
-		{.key = "key_workout_time",		.value = 412},
-		{.key = "key_workout_unit_pcs",		.value = 413},
-		{.key = "key_workout_wait",		.value = 414},
-		{.key = "key_workout_yd",		.value = 415},
-		{.key = "key_workout_yoga",		.value = 416},
+		{.key = "key_settings_set_date",		.value = 237},
+		{.key = "key_settings_set_time",		.value = 238},
+		{.key = "key_settings_set_time_date",		.value = 239},
+		{.key = "key_settings_shortcuts",		.value = 240},
+		{.key = "key_settings_shortcuts_settings",		.value = 241},
+		{.key = "key_settings_sounds",		.value = 242},
+		{.key = "key_settings_start",		.value = 243},
+		{.key = "key_settings_system",		.value = 244},
+		{.key = "key_settings_system_connect_to",		.value = 245},
+		{.key = "key_settings_system_disconnect_t",		.value = 246},
+		{.key = "key_settings_temperature",		.value = 247},
+		{.key = "key_settings_temperature_c",		.value = 248},
+		{.key = "key_settings_temperature_f",		.value = 249},
+		{.key = "key_settings_unit",		.value = 250},
+		{.key = "key_settings_vibration",		.value = 251},
+		{.key = "key_settings_wake_mode",		.value = 252},
+		{.key = "key_settings_watch_imei",		.value = 253},
+		{.key = "key_settings_watch_mac",		.value = 254},
+		{.key = "key_settings_watch_sn",		.value = 255},
+		{.key = "key_settings_watch_version",		.value = 256},
+		{.key = "key_settings_watchface",		.value = 257},
+		{.key = "key_settings_watchface_home",		.value = 258},
+		{.key = "key_setupwizard_connect_failed",		.value = 259},
+		{.key = "key_setupwizard_connect_success",		.value = 260},
+		{.key = "key_setupwizard_connecting",		.value = 261},
+		{.key = "key_setupwizard_download_app",		.value = 262},
+		{.key = "key_setupwizard_language",		.value = 263},
+		{.key = "key_setupwizard_scan_download",		.value = 264},
+		{.key = "key_skip",		.value = 265},
+		{.key = "key_sleep_adequate",		.value = 266},
+		{.key = "key_sleep_awake",		.value = 267},
+		{.key = "key_sleep_deep",		.value = 268},
+		{.key = "key_sleep_doze",		.value = 269},
+		{.key = "key_sleep_duration",		.value = 270},
+		{.key = "key_sleep_hour",		.value = 271},
+		{.key = "key_sleep_min",		.value = 272},
+		{.key = "key_sleep_no_data",		.value = 273},
+		{.key = "key_sleep_quality",		.value = 274},
+		{.key = "key_sleep_rem",		.value = 275},
+		{.key = "key_sleep_score",		.value = 276},
+		{.key = "key_sleep_sleep_score",		.value = 277},
+		{.key = "key_spo2_abnormal",		.value = 278},
+		{.key = "key_spo2_keep_still",		.value = 279},
+		{.key = "key_spo2_low",		.value = 280},
+		{.key = "key_spo2_normal",		.value = 281},
+		{.key = "key_start_wear_watch_tighten",		.value = 282},
+		{.key = "key_start_wear_watch_tips",		.value = 283},
+		{.key = "key_starting",		.value = 284},
+		{.key = "key_stop",		.value = 285},
+		{.key = "key_stress_high",		.value = 286},
+		{.key = "key_stress_level",		.value = 287},
+		{.key = "key_stress_middle",		.value = 288},
+		{.key = "key_stress_normal",		.value = 289},
+		{.key = "key_stress_relax",		.value = 290},
+		{.key = "key_sure",		.value = 291},
+		{.key = "key_temperature",		.value = 292},
+		{.key = "key_timer_customize",		.value = 293},
+		{.key = "key_timer_facial_mask",		.value = 294},
+		{.key = "key_timer_minute",		.value = 295},
+		{.key = "key_timer_pause",		.value = 296},
+		{.key = "key_timer_paused",		.value = 297},
+		{.key = "key_timer_repeat",		.value = 298},
+		{.key = "key_timer_start",		.value = 299},
+		{.key = "key_timer_steamed_egg",		.value = 300},
+		{.key = "key_timer_teeth",		.value = 301},
+		{.key = "key_timer_timing",		.value = 302},
+		{.key = "key_timer_timing_ended",		.value = 303},
+		{.key = "key_tips",		.value = 304},
+		{.key = "key_train_again",		.value = 305},
+		{.key = "key_voice_assistant",		.value = 306},
+		{.key = "key_voice_assistant_wake",		.value = 307},
+		{.key = "key_weather_breeze",		.value = 309},
+		{.key = "key_weather_clear_at_night",		.value = 310},
+		{.key = "key_weather_cloudy",		.value = 311},
+		{.key = "key_weather_cloudy_at_night",		.value = 312},
+		{.key = "key_weather_cloudy_to_clear",		.value = 313},
+		{.key = "key_weather_cold",		.value = 314},
+		{.key = "key_weather_connect_tip",		.value = 315},
+		{.key = "key_weather_dust_storm",		.value = 316},
+		{.key = "key_weather_forecast",		.value = 317},
+		{.key = "key_weather_gale",		.value = 318},
+		{.key = "key_weather_hail",		.value = 319},
+		{.key = "key_weather_hot",		.value = 320},
+		{.key = "key_weather_mist",		.value = 321},
+		{.key = "key_weather_open_app",		.value = 322},
+		{.key = "key_weather_other",		.value = 323},
+		{.key = "key_weather_overcast",		.value = 324},
+		{.key = "key_weather_rain",		.value = 325},
+		{.key = "key_weather_rainstorm",		.value = 326},
+		{.key = "key_weather_rainstorm0",		.value = 327},
+		{.key = "key_weather_sand",		.value = 328},
+		{.key = "key_weather_shower",		.value = 329},
+		{.key = "key_weather_snow",		.value = 330},
+		{.key = "key_weather_sunny",		.value = 331},
+		{.key = "key_weather_switch",		.value = 332},
+		{.key = "key_weather_thunder",		.value = 333},
+		{.key = "key_weather_thunderstorm",		.value = 334},
+		{.key = "key_weather_tornado",		.value = 335},
+		{.key = "key_weather_typhoon",		.value = 336},
+		{.key = "key_widget_activity",		.value = 337},
+		{.key = "key_widget_add",		.value = 338},
+		{.key = "key_widget_download_failed",		.value = 339},
+		{.key = "key_widget_explore",		.value = 340},
+		{.key = "key_widget_health",		.value = 341},
+		{.key = "key_widget_in_out_power",		.value = 342},
+		{.key = "key_widget_life",		.value = 343},
+		{.key = "key_widget_measuring",		.value = 344},
+		{.key = "key_widget_profile_photo",		.value = 345},
+		{.key = "key_widget_workout",		.value = 346},
+		{.key = "key_widgets",		.value = 347},
+		{.key = "key_workout_agps_data",		.value = 348},
+		{.key = "key_workout_ai_ahead",		.value = 349},
+		{.key = "key_workout_ai_behind",		.value = 350},
+		{.key = "key_workout_aver_pace",		.value = 351},
+		{.key = "key_workout_aver_step_freq",		.value = 352},
+		{.key = "key_workout_badminton",		.value = 353},
+		{.key = "key_workout_bpm",		.value = 354},
+		{.key = "key_workout_calorie",		.value = 355},
+		{.key = "key_workout_click_to_pause",		.value = 356},
+		{.key = "key_workout_cycle_indoor",		.value = 357},
+		{.key = "key_workout_cycle_outdoor",		.value = 358},
+		{.key = "key_workout_distance",		.value = 359},
+		{.key = "key_workout_distance_unit_km",		.value = 360},
+		{.key = "key_workout_distance_unit_mile",		.value = 361},
+		{.key = "key_workout_duration_end",		.value = 362},
+		{.key = "key_workout_end_confirm",		.value = 363},
+		{.key = "key_workout_exercised",		.value = 364},
+		{.key = "key_workout_goal_settings",		.value = 365},
+		{.key = "key_workout_gps",		.value = 366},
+		{.key = "key_workout_gps_error",		.value = 367},
+		{.key = "key_workout_gps_tips",		.value = 368},
+		{.key = "key_workout_hike",		.value = 369},
+		{.key = "key_workout_hr_max_hr",		.value = 370},
+		{.key = "key_workout_hr_min_hr",		.value = 371},
+		{.key = "key_workout_interval_reminder",		.value = 372},
+		{.key = "key_workout_jump",		.value = 373},
+		{.key = "key_workout_kcal",		.value = 374},
+		{.key = "key_workout_kilocalorie",		.value = 375},
+		{.key = "key_workout_kilometer",		.value = 376},
+		{.key = "key_workout_km",		.value = 377},
+		{.key = "key_workout_km_h",		.value = 378},
+		{.key = "key_workout_km_km",		.value = 379},
+		{.key = "key_workout_manager",		.value = 380},
+		{.key = "key_workout_mi_h",		.value = 381},
+		{.key = "key_workout_mi_mi",		.value = 382},
+		{.key = "key_workout_mile",		.value = 383},
+		{.key = "key_workout_min_min",		.value = 384},
+		{.key = "key_workout_move_open_area",		.value = 385},
+		{.key = "key_workout_moving",		.value = 386},
+		{.key = "key_workout_no_reminder",		.value = 387},
+		{.key = "key_workout_open_goal",		.value = 388},
+		{.key = "key_workout_open_water_swim",		.value = 389},
+		{.key = "key_workout_pace",		.value = 390},
+		{.key = "key_workout_pause",		.value = 391},
+		{.key = "key_workout_pool_length",		.value = 392},
+		{.key = "key_workout_pool_swim",		.value = 393},
+		{.key = "key_workout_positioning_failed",		.value = 394},
+		{.key = "key_workout_positioning_successf",		.value = 395},
+		{.key = "key_workout_recent_sports",		.value = 396},
+		{.key = "key_workout_repositioning",		.value = 397},
+		{.key = "key_workout_rope_skipping",		.value = 398},
+		{.key = "key_workout_run_indoor",		.value = 399},
+		{.key = "key_workout_run_outdoor",		.value = 400},
+		{.key = "key_workout_settings",		.value = 401},
+		{.key = "key_workout_settings_auto_pause",		.value = 402},
+		{.key = "key_workout_settings_auto_recogn",		.value = 403},
+		{.key = "key_workout_settings_hr_tips",		.value = 404},
+		{.key = "key_workout_settings_hr_warning",		.value = 405},
+		{.key = "key_workout_settings_hr_warningl",		.value = 406},
+		{.key = "key_workout_skip",		.value = 407},
+		{.key = "key_workout_speed",		.value = 408},
+		{.key = "key_workout_spm",		.value = 409},
+		{.key = "key_workout_start",		.value = 410},
+		{.key = "key_workout_step_frequency",		.value = 411},
+		{.key = "key_workout_steps",		.value = 412},
+		{.key = "key_workout_steps_steps",		.value = 413},
+		{.key = "key_workout_tennis",		.value = 414},
+		{.key = "key_workout_time",		.value = 415},
+		{.key = "key_workout_unit_pcs",		.value = 416},
+		{.key = "key_workout_wait",		.value = 417},
+		{.key = "key_workout_yd",		.value = 418},
+		{.key = "key_workout_yoga",		.value = 419},
 	};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 141 - 113
application/aem_watch/resource/360x360/res_style_bitmap.c


BIN
application/aem_watch/resource/360x360/set_time_date/日期.png


BIN
application/aem_watch/resource/360x360/set_time_date/时间.png


BIN
application/aem_watch/resource/multiLang_translate_table.xls


+ 2 - 0
application/aem_watch/simulator/LVGL.Simulator/LVGL.Simulator.vcxproj

@@ -206,6 +206,7 @@
     <ClInclude Include="..\..\src\application\quick_settings\scr_lock\aem_scr_lock.h" />
     <ClInclude Include="..\..\src\application\settings\aem_settings.h" />
     <ClInclude Include="..\..\src\application\settings\aem_settings_zoom_item.h" />
+    <ClInclude Include="..\..\src\application\set_time_date\aem_set_time_date.h" />
     <ClInclude Include="..\..\src\application\show_logo\aem_show_logo.h" />
     <ClInclude Include="..\..\src\application\sleep\aem_sleep.h" />
     <ClInclude Include="..\..\src\application\stopwatch\aem_stopwatch.h" />
@@ -492,6 +493,7 @@
     <ClCompile Include="..\..\src\application\settings\aem_system_tips.c" />
     <ClCompile Include="..\..\src\application\settings\aem_unit_options.c" />
     <ClCompile Include="..\..\src\application\settings\aem_wake_mode.c" />
+    <ClCompile Include="..\..\src\application\set_time_date\aem_set_time_date.c" />
     <ClCompile Include="..\..\src\application\show_logo\aem_show_logo.c" />
     <ClCompile Include="..\..\src\application\sleep\aem_sleep.c" />
     <ClCompile Include="..\..\src\application\stopwatch\aem_stopwatch.c" />

+ 9 - 0
application/aem_watch/simulator/LVGL.Simulator/LVGL.Simulator.vcxproj.filters

@@ -725,6 +725,9 @@
     <ClInclude Include="..\..\..\..\framework\bluetooth\include\btservice_tws_api.h">
       <Filter>framework\bluetooth\include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\application\set_time_date\aem_set_time_date.h">
+      <Filter>aem_watch\application\set_time_date</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="LVGL.Simulator.manifest" />
@@ -1583,6 +1586,9 @@
     <ClCompile Include="..\..\src\application\settings\aem_bt_connect_more.c">
       <Filter>aem_watch\application\settings</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\application\set_time_date\aem_set_time_date.c">
+      <Filter>aem_watch\application\set_time_date</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LVGL.Simulator.rc" />
@@ -1985,6 +1991,9 @@
     <Filter Include="framework\bluetooth\include">
       <UniqueIdentifier>{5d8e3c99-71be-40cb-99e7-baf7f3f4e364}</UniqueIdentifier>
     </Filter>
+    <Filter Include="aem_watch\application\set_time_date">
+      <UniqueIdentifier>{c6d1a7d5-4298-4802-80c5-df587eca3964}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\lib\aem_gui_fwk.lib" />

+ 11 - 4
application/aem_watch/simulator/LVGL.Simulator/bt_watch_simulator.c

@@ -52,6 +52,7 @@ extern void aem_calculator_create(void);
 extern void aem_compass_create(void);
 extern void aem_flashlight_create(void);
 extern void aem_stopwatch_app_create(void);
+extern void aem_set_time_date_app_create(void);
 extern void aem_phone_create(void);
 extern void aem_sleep_create(void);
 extern void aem_weather_create(void);
@@ -92,6 +93,12 @@ aem_app_info_desc_t aem_app_info_begin[] =
             .key_id = ID_KEY_APP_STOP_WATCH,
             .icon = &IMG_SCENE_APPLIST_RES_STOPWATCH_PIC_ICON,
         },
+        {
+            .app_id = AEM_APP_ID_SET_TIME_DATE,
+            .app_entry = aem_set_time_date_app_create,
+            .key_id = ID_KEY_SETTINGS_SET_TIME_DATE,
+            .icon = &IMG_SCENE_APPLIST_RES_SET_TIME_DATE_PIC_ICON,
+        },
         {
             .app_id = AEM_APP_ID_FLASHLIGHT,
             .app_entry = aem_flashlight_create,
@@ -423,10 +430,10 @@ aem_act_list_desc_t aem_app_activity_begin[] =
             .act_id = AEM_SET_BLUETOOTH,
             .activity_entry = aem_bluetooth_create,
         },
-        {
-            .act_id = AEM_SET_BT_OPERATE,
-            .activity_entry = aem_bt_operate_create,
-        },
+        //{
+        //    .act_id = AEM_SET_BT_OPERATE,
+        //    .activity_entry = aem_bt_operate_create,
+        //},
         {
             .act_id = AEM_SET_BT_CONNECT_MORE,
             .activity_entry = aem_bt_connect_more_create,

+ 2 - 1
application/aem_watch/src/application/CMakeLists.txt

@@ -33,4 +33,5 @@ add_subdirectory(timer)
 add_subdirectory(barometer)
 add_subdirectory(power_onoff)
 add_subdirectory(boot_binding)
-add_subdirectory(show_logo)
+add_subdirectory(show_logo)
+add_subdirectory(set_time_date)

+ 1 - 1
application/aem_watch/src/application/quick_settings/aem_quick_setting_alarm.c

@@ -30,7 +30,7 @@ static void card_event_cb(lv_event_t *e)
     }
     else if (LV_EVENT_CLICKED == e->code)
     {
-        aem_app_run(AEM_APP_ID_ALARM);
+        aem_app_run(AEM_APP_ID_SET_TIME_DATE);
         //aem_activity_run(AEM_SET_TIME, (void *)AEM_TIME);
     }
 }

+ 8 - 0
application/aem_watch/src/application/set_time_date/CMakeLists.txt

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+zephyr_include_directories(
+	.
+)
+#zephyr_library_sources(aem_alarm_settime.c)
+zephyr_library_sources(aem_set_time_date.c)
+#zephyr_library_sources(aem_alarm_edit.c)
+#zephyr_library_sources(aem_alarm_full.c)

+ 144 - 0
application/aem_watch/src/application/set_time_date/aem_set_time_date.c

@@ -0,0 +1,144 @@
+/**
+ * @FileName     : aem_set_time_date.c
+ * @Author       : wingcool_group
+ * @CreateDate   : 2024/12/12 14:33:05
+ * @Description  :
+ **/
+
+#include "aem_set_time_date.h"
+#include "aem_zoom_list.h"
+#include "aem_def_settings.h"
+#include "aem_log.h"
+#include "../settings/aem_settings_zoom_item.h"
+
+typedef struct
+{
+    lv_obj_t *page;
+} setting_ui_t;
+
+static setting_ui_t *s_ui = NULL;
+
+static aem_app_id_e activity_id[] = {
+    AEM_SET_TIME,
+    AEM_SET_TIME,
+    //AEM_SET_BLUETOOTH,
+    //AEM_SET_SYSTEM_OPERATE,
+    //AEM_SET_ABOUT_WATCH,
+};
+
+static res_string_id_e get_str[2] =
+    {
+        ID_KEY_SETTINGS_SET_TIME,
+        ID_KEY_SETTINGS_SET_DATE,
+        //ID_KEY_SETTINGS_ABOUT,
+};
+
+static lv_img_dsc_t *get_img[2] =
+    {
+        &IMG_SCENE_SET_TIME_DATE_PIC_SET_TIME,
+        &IMG_SCENE_SET_TIME_DATE_PIC_SET_DATE,
+        //&IMG_SCENE_SETTINGS_RES_LIST_PIC_ABOUT,
+};
+
+static void item_event_handler(lv_event_t *event)
+{
+    int index = activity_id[(int)event->user_data];
+    //aem_activity_run(index, NULL);
+    if ((int)event->user_data == 0)
+        aem_activity_run(AEM_SET_TIME, (void *)AEM_TIME);
+    else
+        aem_activity_run(AEM_SET_TIME, (void *)AEM_DATE);
+}
+
+static void create_ui(void)
+{
+    if (s_ui != NULL)
+        return;
+
+    s_ui = (setting_ui_t *)lv_mem_alloc(sizeof(setting_ui_t));
+    if (s_ui == NULL)
+    {
+        return;
+    }
+    lv_memset(s_ui, 0, sizeof(setting_ui_t));
+
+    s_ui->page = aem_zoom_list_create(lv_scr_act());
+    if (s_ui->page == NULL)
+    {
+        return;
+    }
+
+    lv_obj_set_style_pad_bottom(s_ui->page, SETTINGS_PAD_BOTTOM, LV_PART_MAIN);
+    aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_SET_TIME_DATE));
+
+    //lv_obj_clear_flag(s_ui->page, LV_OBJ_FLAG_CLICKABLE);
+    //lv_obj_set_style_pad_row(s_ui->page, 0, 0);
+    //lv_obj_set_style_pad_bottom(s_ui->page, SETTINGS_PAD_BOTTOM, LV_PART_MAIN);
+    //aem_zoom_list_set_scrollbar_mode(s_ui->page, LV_SCROLLBAR_MODE_ACTIVE);
+    //aem_title_create(s_ui->page, false, res_manager_get_string_from_id(ID_KEY_SETTINGS_SET_TIME_DATE));
+
+    for (int i = 0; i < ARRAY_SIZE(activity_id); i++)
+    {
+        lv_obj_t *item = aem_settings_zoom_item_create(s_ui->page);
+        if (item)
+        {
+            aem_settings_zoom_item_set_src(item, get_img[i]);
+            aem_settings_zoom_item_set_text(item, res_manager_get_string_from_id(get_str[i]));
+            aem_settings_zoom_item_click_cb(item, item_event_handler, (void *)i);
+        }
+    }
+
+    lv_obj_scroll_to_y(s_ui->page, 1, LV_ANIM_OFF);
+}
+
+/////////////////////////////////////////////////////
+
+static void on_start(void)
+{
+    create_ui();
+}
+
+static void on_resume(void)
+{
+}
+
+static void on_suspend(void)
+{
+}
+
+static void on_close(void)
+{
+    if (s_ui != NULL)
+    {
+        if (s_ui->page != NULL)
+        {
+            lv_obj_del(s_ui->page);
+            s_ui->page = NULL;
+        }
+        lv_mem_free(s_ui);
+        s_ui = NULL;
+    }
+}
+
+static int32_t keypad_evt_handler(aem_key_evt_info_t *evt_info)
+{
+    // AEM_LOG_I("aem_test keypad id:%s click:%s \n", get_aem_key_name(evt_info->key_id), get_aem_key_click_type_name(evt_info->key_click_type));
+
+    if (s_ui != NULL && s_ui->page != NULL)
+    {
+        aem_zoom_list_keypad_handler(s_ui->page, evt_info);
+    }
+
+    return 0;
+}
+
+static const aem_sys_evt_ops_t ops = {
+    .key_evt_func = keypad_evt_handler,
+};
+
+void aem_set_time_date_app_create()
+{
+    aem_app_launch(AEM_APP_ID_SET_TIME_DATE, AEM_APP_TIME_DATE, on_start, on_resume, on_suspend, on_close, NULL, &ops);
+}
+
+AEM_APP_DEFINE(AEM_APP_ID_SET_TIME_DATE, AEM_DEFAULT_APP, ID_KEY_SETTINGS_SET_TIME_DATE, IMG_SCENE_APPLIST_RES_SET_TIME_DATE_PIC_ICON, aem_set_time_date_app_create);

+ 75 - 0
application/aem_watch/src/application/set_time_date/aem_set_time_date.h

@@ -0,0 +1,75 @@
+#ifndef LV_AEM_SET_TIME_DATE_H
+#define LV_AEM_SET_TIME_DATE_H
+
+
+#include "app_ui.h"
+#include "aem_bg.h"
+#include "aem_page.h"
+#include "aem_title.h"
+#include "aem_switch.h"
+#include "aem_curve_btn.h"
+#include "aem_radio_btn.h"
+#include "aem_double_label.h"
+#include "aem_single_zoom_btn.h"
+#include "aem_double_label_icon_item.h"
+#include "aem_icon_double_label_item.h"
+#include "aem_icon_double_label_switch_item.h"
+#include "aem_icon_double_label_radio_btn_item.h"
+#include "aem_sys_function_interface.h"
+#include "aem_app_fwk.h"
+#include "aem_activity_id.h"
+#include "aem_app_activity.h"
+#include "aem_activity_list.h"
+#include "aem_data_share.h"
+
+#define SETTINGS_PAD_BOTTOM     AEM_PUB_WIDGET_ITEM_MIN_H
+
+typedef enum
+{
+    AEM_RINGTONE,
+    AEM_MEDIA,
+    AEM_VIBRATE,
+    AEM_BRIGHTNESS,
+} aem_regulator_type_e;
+
+typedef enum
+{
+    AEM_TEMPERATURE,
+    AEM_DISTANCE,
+    // AEM_WEIGHT,
+    AEM_UNIT_MAX,
+} aem_unit_type_e;
+
+typedef enum
+{
+    AEM_AOD_START,
+    AEM_AOD_END,
+    AEM_WAKE_START,
+    AEM_WAKE_END,
+    AEM_DND_START,
+    AEM_DND_END,
+    AEM_TIME,
+    AEM_DATE,
+} aem_set_time_type_e;
+
+typedef enum
+{
+    AEM_CONNECT_MORE,
+    AEM_RESET,
+    AEM_RESTART,
+    AEM_POWER_OFF,
+    AEM_BLUETOOTH,
+    AEM_SYSTEM_END,
+} aem_system_type_e;
+
+typedef enum
+{
+    TXT_SCHEDULED,
+    TXT_START_TIME,
+    TXT_END_TIME,
+    TXT_OK,
+} aem_common_txt_e;
+
+void aem_set_time_date_app_create(void);
+
+#endif

+ 2 - 2
application/aem_watch/src/application/settings/aem_bluetooth.c

@@ -90,7 +90,7 @@ static void sub_label_del(lv_event_t *event)
 
     s_ui->sub_label = NULL;
 }
-
+#if 0
 static void item_event_handler(lv_event_t *event)
 {
     if (s_ui == NULL || event == NULL)
@@ -136,7 +136,7 @@ static void item_event_handler(lv_event_t *event)
         AEM_LOG_I("s_ui->timer %p", s_ui->timer);
     }
 }
-#if 0
+
 static void update_ui(aem_bt_device_info_t *info)
 {
     if (s_ui == NULL || info == NULL)

+ 1 - 1
application/aem_watch/src/application/settings/aem_bt_operate.c

@@ -138,4 +138,4 @@ int aem_bt_operate_create(void *user_data)
     return aem_activity_create(ACTIVITY_ID, msg_handler);
 }
 
-AEM_ACTIVITY_DEFINE(AEM_SET_BT_OPERATE, aem_bt_operate_create);
+//AEM_ACTIVITY_DEFINE(AEM_SET_BT_OPERATE, aem_bt_operate_create);

+ 248 - 64
application/aem_watch/src/application/settings/aem_set_time.c

@@ -1,7 +1,7 @@
 /**
  * @FileName     : aem_set_time.c
- * @Author       : aem_group
- * @CreateDate   : 2023/11/24 10:27:44
+ * @Author       : wingcool_group
+ * @CreateDate   : 2024/12/12 10:27:44
  * @Description  :
  **/
 
@@ -16,23 +16,42 @@
 typedef struct
 {
     lv_obj_t *page;
+    lv_obj_t *year_obj;
+    lv_obj_t *month_obj;
+    lv_obj_t *day_obj;
     lv_obj_t *hour_obj;
     lv_obj_t *min_obj;
+    lv_obj_t *week_obj;
     lv_obj_t *am_pm_obj;
     lv_obj_t *key_obj;
+    uint16_t year;  // will be set to rtc
+    uint8_t month;  // months since January - [1, 12]
+    uint8_t day;    // day of the month - [1, 31]
     uint8_t hour;
     uint8_t min;
+    uint8_t week;
     uint8_t am_pm;
+    uint8_t week_opts[50];
     uint8_t am_pm_opts[50];
 } set_time_ui_t;
 
 static set_time_ui_t *s_ui = NULL;
 static aem_set_time_type_e type = 0;
 
+uint8_t bySetHour = 0xFF;
+uint8_t bySetMinute = 0xFF;
+uint8_t bySetWeekday = 0xFF;
+uint16_t wSetYear = 0xFF;
+uint8_t bySetMonth = 0xFF;
+uint8_t bySetDay = 0xFF;
+
+extern uint8_t read_time_data[7];
+
 static void get_time_type(void)
 {
     switch (type)
     {
+#if 0        
     case AEM_AOD_START:
     {
         aem_aod_info_t *info = aem_share_get_aod_data();
@@ -75,18 +94,33 @@ static void get_time_type(void)
         s_ui->min = info->end_min;
         break;
     }
+#endif    
     case AEM_TIME:
     {
+    #ifndef CONFIG_SIMULATOR    
+        s_ui->hour = read_time_data[2];
+        s_ui->min = read_time_data[1];
+        s_ui->week = read_time_data[4];
+    #else    
         aem_time_t *time = aem_get_system_time();
         s_ui->hour = time->hour;
         s_ui->min = time->min;
+        s_ui->week = time->wday;
+    #endif
         break;
     }
     case AEM_DATE:
     {
+    #ifndef CONFIG_SIMULATOR   
+        s_ui->year = read_time_data[6] + 2000;
+	    s_ui->month = read_time_data[5];
+        s_ui->day = read_time_data[3];
+    #else
         aem_time_t *time = aem_get_system_time();
-        s_ui->hour = time->month;
-        s_ui->min = time->day;
+        s_ui->year = time->year;
+        s_ui->month = time->month;
+        s_ui->day = time->day;
+    #endif
         break;
     }
     default:
@@ -94,15 +128,11 @@ static void get_time_type(void)
     }
 }
 
-uint8_t bySetHour = 255;
-uint8_t bySetMinute = 255;
-uint8_t bySetMonth = 0;
-uint8_t bySetDay = 0;
-
 static void click_event_cb(lv_event_t *event)
 {
     switch (type)
     {
+#if 0        
     case AEM_AOD_START:
     {
         aem_aod_info_t wake = { 0 };
@@ -163,32 +193,38 @@ static void click_event_cb(lv_event_t *event)
         aem_share_set_dnd_data(&dnd);
         break;
     }
+#endif    
     case AEM_TIME:
     {
         aem_time_t time = { 0 };
         aem_get_cur_system_time(&time);
         time.hour = s_ui->hour;
         time.min = s_ui->min;
-        time.second = 0;
+        time.wday = s_ui->week;
         aem_set_system_time(&time);
         bySetHour = s_ui->hour;
         bySetMinute = s_ui->min;
-        bySetMonth = 0;
-        bySetDay = 0;
+        bySetWeekday = s_ui->week;
+        wSetYear = 0xFF;
+        bySetMonth = 0xFF;
+        bySetDay = 0xFF;
+        //os_printk("bySetWeekday = %d\n", bySetWeekday);
         break;
     }
     case AEM_DATE:
     {
         aem_time_t time = { 0 };
         aem_get_cur_system_time(&time);
-        time.month = s_ui->hour;
-        time.day = s_ui->min;
-        time.second = 0;
+        time.year = s_ui->year;
+        time.month = s_ui->month;
+        time.day = s_ui->day;
         aem_set_system_time(&time);
-        bySetMonth = s_ui->hour;
-        bySetDay = s_ui->min;
+        wSetYear = s_ui->year;
+        bySetMonth = s_ui->month;
+        bySetDay = s_ui->day;
         bySetHour = 0xFF;
         bySetMinute = 0xFF;
+        bySetWeekday = 0xFF;
         break;
     }
     default:
@@ -197,41 +233,117 @@ static void click_event_cb(lv_event_t *event)
     aem_app_goback();
 }
 
-static void roller_hour_event_cb(lv_obj_t *obj, uint16_t id)
+static void roller_hour_year_event_cb(lv_obj_t *obj, uint16_t id)
 {
     if (s_ui == NULL || obj == NULL)
         return;
 
-    s_ui->hour = id % 24;
-    s_ui->key_obj = obj;
+    if (type == AEM_DATE)
+    {
+        s_ui->year = id % 100;
+        s_ui->key_obj = obj;
 
-    aem_roller_adv_set_actived(obj, true);
-    if (s_ui->min_obj != NULL)
+        aem_roller_adv_set_actived(obj, true);
+        if (s_ui->month_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->month_obj, false);
+        }
+        if (s_ui->day_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->day_obj, false);
+        }
+    }
+    else
     {
-        aem_roller_adv_set_actived(s_ui->min_obj, false);
+        s_ui->hour = id % 24;
+        s_ui->key_obj = obj;
+
+        aem_roller_adv_set_actived(obj, true);
+        if (s_ui->min_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->min_obj, false);
+        }
+        if (s_ui->week_obj != NULL)
+        {
+            aem_roller_set_actived(s_ui->week_obj, false);  //注意与aem_roller_adv_set_actived区分
+        }
     }
-    if (s_ui->am_pm_obj != NULL)
+}
+
+static void roller_min_month_event_cb(lv_obj_t *obj, uint16_t id)
+{
+    if (s_ui == NULL || obj == NULL)
+        return;
+
+    if (type == AEM_DATE)
     {
-        aem_roller_set_actived(s_ui->am_pm_obj, false);
+        s_ui->month = id % 13;
+        s_ui->key_obj = obj;
+
+        aem_roller_adv_set_actived(obj, true);
+        if (s_ui->year_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->year_obj, false);
+        }
+        if (s_ui->day_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->day_obj, false);
+        }
+    }
+    else
+    {
+        s_ui->min = id % 60;
+        s_ui->key_obj = obj;
+
+        aem_roller_adv_set_actived(obj, true);
+        if (s_ui->hour_obj != NULL)
+        {
+            aem_roller_adv_set_actived(s_ui->hour_obj, false);
+        }
+        if (s_ui->week_obj != NULL)
+        {   
+            aem_roller_set_actived(s_ui->week_obj, false);  //注意与aem_roller_adv_set_actived区分
+        }
     }
 }
 
-static void roller_min_event_cb(lv_obj_t *obj, uint16_t id)
+static void roller_week_event_cb(lv_obj_t *obj, uint16_t id)
 {
     if (s_ui == NULL || obj == NULL)
         return;
 
-    s_ui->min = id % 60;
+    s_ui->week = id % 20;
     s_ui->key_obj = obj;
 
-    aem_roller_adv_set_actived(obj, true);
+    //os_printk("roller_week_event_cb id:%d, week:%d\n", id, s_ui->week);
+
+    aem_roller_set_actived(obj, true);  //注意与aem_roller_adv_set_actived区分
     if (s_ui->hour_obj != NULL)
     {
         aem_roller_adv_set_actived(s_ui->hour_obj, false);
     }
-    if (s_ui->am_pm_obj != NULL)
+    if (s_ui->min_obj != NULL)
     {
-        aem_roller_set_actived(s_ui->am_pm_obj, false);
+        aem_roller_adv_set_actived(s_ui->min_obj, false);
+    }
+}
+
+static void roller_day_event_cb(lv_obj_t *obj, uint16_t id)
+{
+    if (s_ui == NULL || obj == NULL)
+        return;
+
+    s_ui->day = id % 32;
+    s_ui->key_obj = obj;
+
+    aem_roller_adv_set_actived(obj, true);
+    if (s_ui->year_obj != NULL)
+    {
+        aem_roller_adv_set_actived(s_ui->year_obj, false);
+    }
+    if (s_ui->month_obj != NULL)
+    {
+        aem_roller_adv_set_actived(s_ui->month_obj, false);
     }
 }
 
@@ -243,7 +355,7 @@ static void roller_am_pm_event_cb(lv_obj_t *obj, uint16_t id)
     s_ui->am_pm = id % 2;
     s_ui->key_obj = obj;
 
-    aem_roller_set_actived(obj, true);
+    aem_roller_set_actived(obj, true);  //注意与aem_roller_adv_set_actived区分
     if (s_ui->hour_obj != NULL)
     {
         aem_roller_adv_set_actived(s_ui->hour_obj, false);
@@ -275,14 +387,14 @@ static void create_ui(void)
         return;
     }
 
-    if (type == AEM_AOD_START || type == AEM_DND_START || type == AEM_WAKE_START)
-    {
-        aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_START));
-    }
-    else if (type == AEM_AOD_END || type == AEM_DND_END || type == AEM_WAKE_END)
-    {
-        aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_END));
-    }
+    //if (type == AEM_AOD_START || type == AEM_DND_START || type == AEM_WAKE_START)
+    //{
+    //    aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_START));
+    //}
+    //else if (type == AEM_AOD_END || type == AEM_DND_END || type == AEM_WAKE_END)
+    //{
+    //    aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_END));
+    //}
 
     lv_obj_t *roller = aem_bg_create(s_ui->page, DEF_UI_WIDTH, DEF_UI_HEIGHT / 2, lv_color_black());
     if (roller == NULL)
@@ -293,60 +405,132 @@ static void create_ui(void)
     lv_obj_set_flex_align(roller, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
     lv_obj_center(roller);
 
-    lv_obj_t *roller_hour = aem_roller_adv_create(roller, aem_font_xxlarge());
-    if (roller_hour)
+    lv_obj_t *roller_hour_year = aem_roller_adv_create(roller, aem_font_xxlarge());
+    if (roller_hour_year)
     {
-        lv_obj_clear_flag(roller_hour, LV_OBJ_FLAG_SCROLLABLE);
-        aem_roller_adv_set_label_line_space(roller_hour, AEM_SIZE_FACTOR_466(-15));
-        aem_roller_adv_set_single(roller_hour, false);
-        aem_roller_adv_set_text_changed_event_cb(roller_hour, roller_hour_event_cb);
+        lv_obj_clear_flag(roller_hour_year, LV_OBJ_FLAG_SCROLLABLE);
+        
+        aem_roller_adv_set_label_line_space(roller_hour_year, AEM_SIZE_FACTOR_466(-15));
+        aem_roller_adv_set_single(roller_hour_year, false);
+        aem_roller_adv_set_text_changed_event_cb(roller_hour_year, (aem_roller_adv_event_cb_t)roller_hour_year_event_cb);
         if (type == AEM_DATE)
         {
-            aem_roller_adv_set_options(roller_hour, s_ui->hour, 1, 12, 1);
+            lv_obj_set_width(roller_hour_year, AEM_SIZE_FACTOR_466(183));
+
+            aem_roller_adv_set_options(roller_hour_year, s_ui->year, 2000, 2099, 1);
+
+            s_ui->year_obj = roller_hour_year;
         }
         else
         {
+            lv_obj_set_width(roller_hour_year, AEM_SIZE_FACTOR_466(90));
+
             if (aem_share_get_hour_mode() == HOUR_MODE_12H)
             {
-                aem_roller_adv_set_hour_mode(roller_hour, true);
+                aem_roller_adv_set_hour_mode(roller_hour_year, true);
             }
 
-            aem_roller_adv_set_options(roller_hour, s_ui->hour, 0, 23, 1);
+            aem_roller_adv_set_options(roller_hour_year, s_ui->hour, 0, 23, 1);
+
+            s_ui->hour_obj = roller_hour_year;
         }
-        s_ui->hour_obj = roller_hour;
-        s_ui->key_obj = roller_hour;
+        
+        s_ui->key_obj = roller_hour_year;
     }
 
     lv_obj_t *colon1 = text_canvas_create(roller);
     if (colon1)
     {
-        lv_obj_set_size(colon1, AEM_SIZE_FACTOR_466(22), AEM_SIZE_FACTOR_466(110));
         lv_obj_set_style_text_font(colon1, aem_font_xxlarge(), LV_PART_MAIN);
         lv_obj_set_style_text_color(colon1, lv_color_white(), LV_PART_MAIN);
         lv_obj_set_style_text_align(colon1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);
-        text_canvas_set_text(colon1, ":");
+        if (type == AEM_DATE)
+        {
+            lv_obj_set_size(colon1, AEM_SIZE_FACTOR_466(22), AEM_SIZE_FACTOR_466(95));
+
+            text_canvas_set_text(colon1, ".");
+        }
+        else
+        {
+            lv_obj_set_size(colon1, AEM_SIZE_FACTOR_466(22), AEM_SIZE_FACTOR_466(110));
+
+            text_canvas_set_text(colon1, ":");
+        }
+    }
+
+    lv_obj_t *roller_min_month = aem_roller_adv_create(roller, aem_font_xxlarge());
+    if (roller_min_month)
+    {
+        lv_obj_clear_flag(roller_min_month, LV_OBJ_FLAG_SCROLLABLE);
+        lv_obj_set_width(roller_min_month, AEM_SIZE_FACTOR_466(90));
+        aem_roller_adv_set_label_line_space(roller_min_month, AEM_SIZE_FACTOR_466(-15));
+        aem_roller_adv_set_single(roller_min_month, false);
+        aem_roller_adv_set_actived(roller_min_month, false);
+        aem_roller_adv_set_text_changed_event_cb(roller_min_month, (aem_roller_adv_event_cb_t)roller_min_month_event_cb);
+        if (type == AEM_DATE)
+        {
+            aem_roller_adv_set_options(roller_min_month, s_ui->month, 1, 12, 1);
+
+            s_ui->month_obj = roller_min_month;
+        }
+        else
+        {
+            aem_roller_adv_set_options(roller_min_month, s_ui->min, 0, 59, 1);
+
+            s_ui->min_obj = roller_min_month;
+        }
     }
 
-    lv_obj_t *roller_min = aem_roller_adv_create(roller, aem_font_xxlarge());
-    if (roller_min)
+    lv_obj_t *colon2 = text_canvas_create(roller);
+    if (colon2)
     {
-        lv_obj_clear_flag(roller_min, LV_OBJ_FLAG_SCROLLABLE);
-        aem_roller_adv_set_label_line_space(roller_min, AEM_SIZE_FACTOR_466(-15));
-        aem_roller_adv_set_single(roller_min, false);
-        aem_roller_adv_set_actived(roller_min, false);
-        aem_roller_adv_set_text_changed_event_cb(roller_min, roller_min_event_cb);
+        lv_obj_set_size(colon2, AEM_SIZE_FACTOR_466(22), AEM_SIZE_FACTOR_466(95));
+        lv_obj_set_style_text_font(colon2, aem_font_xxlarge(), LV_PART_MAIN);
+        lv_obj_set_style_text_color(colon2, lv_color_white(), LV_PART_MAIN);
+        lv_obj_set_style_text_align(colon2, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);
         if (type == AEM_DATE)
         {
-            aem_roller_adv_set_options(roller_min, s_ui->min, 1, 31, 1);
+            text_canvas_set_text(colon2, ".");
         }
         else
         {
-            aem_roller_adv_set_options(roller_min, s_ui->min, 0, 59, 1);
+            text_canvas_set_text(colon2, " ");
         }
-        s_ui->min_obj = roller_min;
     }
 
-    if (aem_share_get_hour_mode() == HOUR_MODE_12H)
+    if (type == AEM_DATE)
+    {
+        lv_obj_t *roller_day = aem_roller_adv_create(roller, aem_font_xxlarge());
+        if (roller_day)
+        {
+            lv_obj_clear_flag(roller_day, LV_OBJ_FLAG_SCROLLABLE);
+            lv_obj_set_width(roller_day, AEM_SIZE_FACTOR_466(90));
+            aem_roller_adv_set_label_line_space(roller_day, AEM_SIZE_FACTOR_466(-15));
+            aem_roller_adv_set_single(roller_day, false);
+            aem_roller_adv_set_actived(roller_day, false);
+            aem_roller_adv_set_text_changed_event_cb(roller_day, (aem_roller_adv_event_cb_t)roller_day_event_cb);
+            aem_roller_adv_set_options(roller_day, s_ui->day, 1, 31, 1);
+            s_ui->day_obj = roller_day;
+        }
+    }      
+    else
+    {
+        sprintf(s_ui->week_opts, "%s\n%s\n%s\n%s\n%s\n%s\n%s", "Mon.", "Tues.", "Wed.", "Thur.", "Fri.", "Sat.", "Sun.");
+        lv_obj_t *roller_week = aem_roller_create(roller, aem_font_xlarge());
+        if (roller_week)
+        {
+            lv_obj_set_width(roller_week, AEM_SIZE_FACTOR_466(160));
+            lv_obj_set_height(aem_roller_get_roller(roller_week), DEF_UI_HEIGHT >> 1);
+            aem_roller_set_label_line_space(roller_week, AEM_SIZE_FACTOR_466(8));
+            aem_roller_set_options(roller_week, s_ui->week_opts, LV_ROLLER_MODE_INFINITE);
+            aem_roller_set_selected(roller_week, (s_ui->week-1), LV_ANIM_OFF);
+            aem_roller_set_actived(roller_week, false);  //注意与aem_roller_adv_set_actived区分
+            aem_roller_set_value_changed_event_cb(roller_week, (aem_roller_event_cb_t)roller_week_event_cb);
+            s_ui->week_obj = roller_week;
+        }
+    }
+    
+    if ((aem_share_get_hour_mode() == HOUR_MODE_12H) && (type == AEM_TIME))
     {
         sprintf(s_ui->am_pm_opts, "%s\n%s", res_manager_get_string_from_id(ID_KEY_ALARM_AM), res_manager_get_string_from_id(ID_KEY_ALARM_PM));
 
@@ -358,7 +542,7 @@ static void create_ui(void)
             aem_roller_set_label_line_space(roller_am_pm, AEM_SIZE_FACTOR_466(8));
             aem_roller_set_options(roller_am_pm, s_ui->am_pm_opts, LV_ROLLER_MODE_NORMAL);
             aem_roller_set_selected(roller_am_pm, (s_ui->hour / 12), LV_ANIM_OFF);
-            aem_roller_set_actived(roller_am_pm, false);
+            aem_roller_set_actived(roller_am_pm, false);  //注意与aem_roller_adv_set_actived区分
             aem_roller_set_value_changed_event_cb(roller_am_pm, (aem_roller_event_cb_t)roller_am_pm_event_cb);
             s_ui->am_pm_obj = roller_am_pm;
         }

+ 2 - 2
application/aem_watch/src/user_cfg/data_default_cfg.h

@@ -13,9 +13,9 @@
 #define TIMING_OPEN (0x01)  // 定时开启
 
 // 锁屏时间配置
-#define SCREEN_LOCK_TIME (15)                                      // 熄屏时间
+#define SCREEN_LOCK_TIME (60)                                      // 熄屏时间
 #define SCREEN_CLOCK_TIME_OPTS_NUM (7)                             // 熄屏时间选项个数
-const static char *s_lock_time_opts = "5\n10\n15\n20\n25\n30\n60"; // 熄屏时间选项
+const static char *s_lock_time_opts = "15\n20\n30\n45\n60\n90\n120"; // 熄屏时间选项
 
 // 默认系统时间
 const static char *s_def_datetime_str = "2024-03-01 08:00:00"; // 默认系统日期时间字符串

+ 1 - 1
thirdparty/lib/aem/include/aem_activity_id.h

@@ -16,7 +16,7 @@ typedef enum
     AEM_SET_AOD_WATCHFACE,
     AEM_SLIDING_EFFECT,
     AEM_SET_BLUETOOTH,
-    AEM_SET_BT_OPERATE,
+    //AEM_SET_BT_OPERATE,
     AEM_SET_BT_CONNECT_MORE,
     AEM_SET_SOUND_VIBRATION,
     AEM_SET_DISPLAY,

+ 2 - 0
thirdparty/lib/aem/include/aem_app_id.h

@@ -23,6 +23,7 @@ typedef enum
     AEM_APP_ID_ALARM,
     AEM_APP_ID_TIMER,
     AEM_APP_ID_STOPWATCH,
+    AEM_APP_ID_SET_TIME_DATE,
     AEM_APP_ID_WEATHER,
     AEM_APP_ID_SLEEP,
     AEM_APP_ID_STRESS,
@@ -80,6 +81,7 @@ typedef enum
 #define AEM_APP_SLEEP "sleep"
 #define AEM_APP_ALARM "alarm"
 #define AEM_APP_TIMER "timer"
+#define AEM_APP_TIME_DATE "time_date"
 #define AEM_APP_BAROMETER "barometer"
 #define AEM_APP_BOOT_BINDING "boot_binding"
 #define AEM_APP_CUSTOM_TEST "custom_test"

+ 21 - 8
zephyr/drivers/input/sd8563_timer_acts.c

@@ -68,12 +68,16 @@ static void _sd8563_read_time(const struct device *i2c_dev);
 static void _sd8563_set_time(const struct device *i2c_dev, 
 							 uint8_t set_hour, 
 							 uint8_t set_minute,
+							 uint8_t set_week,
+							 uint16_t set_year,
 							 uint8_t set_month,
 							 uint8_t set_day);
 extern void uart2_poll_out_ch(int c);
 
 extern uint8_t bySetHour;
 extern uint8_t bySetMinute;
+extern uint8_t bySetWeekday;
+extern uint16_t wSetYear;
 extern uint8_t bySetMonth;
 extern uint8_t bySetDay;
 
@@ -84,21 +88,23 @@ static void timer_acts_handler(struct k_work *work)
 {
 	static struct acts_timer_data *external_rtc = &timer_acts_ddata;
 
-    if ((bySetHour != 0xff) || (bySetMonth != 0))
+    if ((bySetHour != 0xff) || (wSetYear != 0xff))
 	{
 		hrtimer_stop(&g_rtc_ht_read);
 
 		if (_sd8563_close_write_protection(external_rtc->i2c_dev) == 1)
 		{
-			_sd8563_set_time(external_rtc->i2c_dev, bySetHour, bySetMinute, bySetMonth, bySetDay);
+			_sd8563_set_time(external_rtc->i2c_dev, bySetHour, bySetMinute, bySetWeekday, wSetYear, bySetMonth, bySetDay);
 
 			_sd8563_open_write_protection(external_rtc->i2c_dev);
 		}
 
 		bySetHour = 0xff;
 		bySetMinute = 0xff;
-		bySetMonth = 0;
-		bySetDay = 0;
+		bySetWeekday = 0xff;
+		wSetYear = 0xff;
+		bySetMonth = 0xff;
+		bySetDay = 0xff;
 
 		hrtimer_restart(&g_rtc_ht_read);
 
@@ -317,6 +323,8 @@ static int _sd8563_close_write_protection(const struct device *i2c_dev)
 static void _sd8563_set_time(const struct device *i2c_dev, 
 							 uint8_t set_hour, 
 							 uint8_t set_minute,
+							 uint8_t set_week,
+							 uint16_t set_year,
 							 uint8_t set_month,
 							 uint8_t set_day)
 {
@@ -336,7 +344,7 @@ static void _sd8563_set_time(const struct device *i2c_dev,
 		return;
 	}
 
-    if (set_hour == 0xFF && set_month == 0)  //power on
+    if ((set_hour == 0xFF) && (set_year == 0xFF))  //power on
 	{
 		printk("read_cmd[0] = %d\n", read_cmd[0]);
 		if ((read_cmd[0] & 0x80) == 0)  //bit7:0SF/
@@ -353,15 +361,18 @@ static void _sd8563_set_time(const struct device *i2c_dev,
     printk("y:20%d, mon:%d, week:%d, d:%d, h:%d, min:%d, sec:%d\n",
 			read_time_data[6], read_time_data[5], read_time_data[4], read_time_data[3], read_time_data[2], read_time_data[1], read_time_data[0]);
 
-	if(set_minute != 0XFF)
+	if(set_hour != 0xFF)
 	{
+		read_time_data[0] = 0;
 		read_time_data[1] = set_minute;//(set_minute / 10) * 16  + set_minute % 10;  //DEC TO BCD CODE
 		read_time_data[2] = set_hour;//(set_hour / 10) * 16  + set_hour % 10;  //DEC TO BCD CODE
+		read_time_data[4] = set_week % 7;//0:Sun. 1:Mon. 2:Tue. 3:Wed. 4:Thu. 5:Fri. 6:Sat.
 	}
-	else if (set_month != 0)
+	else if (set_year != 0xFF)
 	{
 		read_time_data[3] = set_day;//(set_day / 10) * 16  + set_day % 10;  //DEC TO BCD CODE
 		read_time_data[5] = set_month;//(set_month / 10) * 16  + set_month % 10;  //DEC TO BCD CODE
+		read_time_data[6] = set_year;//(set_year / 10) * 16  + set_year % 10;  //DEC TO BCD CODE
 	}
 
     if (power_on_set_time_data == true)
@@ -374,6 +385,8 @@ static void _sd8563_set_time(const struct device *i2c_dev,
 		write_cmd[5] = 0x06;  //week
 		write_cmd[6] = 0x10;  //mon
 		write_cmd[7] = 0x24;  //year
+
+		printk("power on set time and date\n");
 	}
 	else
 	{
@@ -469,7 +482,7 @@ static void _sd8563_init_work(struct k_work *work)
 	{
 		//k_msleep(2);
 
-        _sd8563_set_time(external_rtc->i2c_dev, 0xFF, 0xFF, 0, 0);
+        _sd8563_set_time(external_rtc->i2c_dev, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
 
         //k_msleep(2);
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio