1、增加生产时获取设备ID和读写key值的函数接口（目前未调用）

2、增加表盘桌面上滑出通知列表的功能开关，目前关闭此功能
3、about watch里增加FCC ID和FCC WARNINGS
4、OTA相关字体有小改动

application/aem_watch/prj.conf

@@ -380,6 +380,7 @@ CONFIG_HAVE_CUSTOM_LINKER_SCRIPT=y
 CONFIG_AEM_WATCH_SUPPORT=y
 CONFIG_AEM_AOD_MODE_SUPPORT=y
 CONFIG_AEM_MONITOR=y
+CONFIG_AEM_DEFENDER=y
 CONFIG_VIDEO_APP_AUDIO_ENABLE=n
 #### aem application
 CONFIG_AEM_APPLICATION_TEST=y

application/aem_watch/src/application/ota/aem_ota_app.c

@@ -39,7 +39,7 @@ typedef struct
 static ota_ui_data_t *s_ota_ui_data = NULL;
 static void ota_ui_create(void);
 
-LV_FONT_DECLARE(ota_font)
+LV_FONT_DECLARE(lv_ota_font_26)
 
 static int32_t keypad_evt_handler(aem_key_evt_info_t *evt_info)
 {
@@ -102,7 +102,7 @@ static void create_ui(ota_ui_data_t *ui_data)
     lv_obj_t *label = text_canvas_create(bg);
     if (label != NULL)
     {
-        lv_obj_set_style_text_font(label, &ota_font, 0);
+        lv_obj_set_style_text_font(label, &lv_ota_font_26, 0);
         lv_obj_set_style_text_color(label, lv_color_white(), 0);
         lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_CENTER, 0);
         lv_obj_set_width(label, TEXT_WIDTH);
@@ -112,19 +112,19 @@ static void create_ui(ota_ui_data_t *ui_data)
     lv_obj_t *bar = lv_bar_create(bg);
     if (bar != NULL)
     {
-        lv_obj_set_size(bar, AEM_SIZE_HOR_FACTOR_466(300), AEM_SIZE_VER_FACTOR_466(20));
-        lv_obj_set_style_bg_color(bar, lv_color_hex(0xFFFFFF), LV_PART_MAIN);
+        lv_obj_set_size(bar, AEM_SIZE_HOR_FACTOR_466(300), AEM_SIZE_VER_FACTOR_466(8));
+        lv_obj_set_style_bg_color(bar, lv_color_hex(0x191919), LV_PART_MAIN);
         lv_obj_set_style_bg_opa(bar, LV_OPA_COVER, LV_PART_INDICATOR);
-        lv_obj_set_style_bg_opa(bar, LV_OPA_10, LV_PART_MAIN);
-        lv_obj_set_style_bg_color(bar, lv_color_hex(0x338FFF), LV_PART_INDICATOR);
-        lv_obj_set_style_radius(bar, 10, LV_PART_MAIN);
+        lv_obj_set_style_bg_opa(bar, LV_OPA_COVER, LV_PART_MAIN);
+        lv_obj_set_style_bg_color(bar, lv_color_hex(0xFFFFFF), LV_PART_INDICATOR);
+        // lv_obj_set_style_radius(bar, 10, LV_PART_MAIN);
     }
     ui_data->progress_bar = bar;
 
     lv_obj_t *result_label = text_canvas_create(bg);
     if (result_label != NULL)
     {
-        lv_obj_set_style_text_font(result_label, &ota_font, 0);
+        lv_obj_set_style_text_font(result_label, &lv_ota_font_26, 0);
         lv_obj_set_style_text_color(result_label, lv_color_white(), 0);
         lv_obj_set_width(result_label, TEXT_WIDTH);
         lv_obj_set_style_text_align(result_label, LV_TEXT_ALIGN_CENTER, 0);
@@ -166,7 +166,7 @@ static void ota_update_ui(aem_ota_info_t *info, ota_ui_data_t *ui_data)
             text_canvas_set_text_fmt(ui_data->download_label, "Download %d%%...", info->progress);
             lv_obj_align(ui_data->download_label, LV_ALIGN_TOP_MID, 0, AEM_SIZE_VER_FACTOR_466(180));
             lv_bar_set_value(ui_data->progress_bar, info->progress, false);
-            lv_obj_align(ui_data->progress_bar, LV_ALIGN_BOTTOM_MID, 0, AEM_SIZE_VER_FACTOR_466(-140));
+            lv_obj_align(ui_data->progress_bar, LV_ALIGN_BOTTOM_MID, 0, AEM_SIZE_VER_FACTOR_466(-200));
         }
     }
     else if (info->type == POP_OTA_FAILED)

application/aem_watch/src/application/settings/aem_about_watch.c

@@ -14,7 +14,7 @@
 #include "aem_double_label.h"
 #include "aem_log.h"
 #include "aem_adapter_dev.h"
-
+#include "text_canvas.h"
 #ifndef CONFIG_SIMULATOR
 #include "aem_sleep_his_data.h"
 #endif
@@ -41,6 +41,7 @@ typedef struct
     lv_obj_t *version;
     lv_obj_t *mac;
     lv_obj_t *sn;
+    lv_obj_t *fcc_id;
 
     lv_obj_t *bg2;
     lv_obj_t *aem_ver;
@@ -66,6 +67,11 @@ static uint8_t item_num = 0;
 static uint8_t item_num = 7;
 #endif
 
+static inline lv_color_t lv_color_gray(void)
+{
+    return lv_color_make(0x90, 0x94, 0x94);
+}
+
 static void debug_hidden(void)
 {
     if (item_num < 6)
@@ -141,6 +147,34 @@ static void create_about_ui(void)
     s_ui->mac = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_MAC), str);
 
     s_ui->sn = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_SN), "NULL");
+
+    s_ui->fcc_id = aem_double_label_create(s_ui->bg1, "FCC ID", "2BMQY2024");
+
+    lv_obj_t *fcc_warnings = text_canvas_create(s_ui->bg1);
+    if (fcc_warnings)
+    {
+        lv_obj_set_width(fcc_warnings, 360);
+        lv_obj_set_style_text_align(fcc_warnings, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);
+        lv_obj_set_style_text_color(fcc_warnings, lv_color_white(), LV_PART_MAIN);
+        lv_obj_set_style_text_font(fcc_warnings, aem_font_def(), LV_PART_MAIN);
+        lv_obj_clear_flag(fcc_warnings, LV_OBJ_FLAG_CLICKABLE);
+
+        text_canvas_set_text(fcc_warnings, "FCC WARNINGS");
+        //lv_obj_align_to(s_ui->fcc_id, fcc_warnings, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+    }
+
+    lv_obj_t *tips = text_canvas_create(fcc_warnings);
+    if (tips)
+    {
+        lv_obj_set_width(tips, 260);
+        lv_obj_set_style_text_align(tips, LV_TEXT_ALIGN_LEFT, LV_PART_MAIN);
+        lv_obj_set_style_text_color(tips, lv_color_gray(), LV_PART_MAIN);
+        lv_obj_set_style_text_font(tips, aem_font_small(), LV_PART_MAIN);
+        lv_obj_clear_flag(tips, LV_OBJ_FLAG_CLICKABLE);
+
+        text_canvas_set_text(tips, "This device complies with Part 15 of the FCC Rules.\nOperation is subject to the condition that this device does not cause harmful interference.\nThis device is verified to comply with Part 15 of the FCC Rules for use with cable television service.");//res_manager_get_string_from_id(_str_ids[1]));
+        lv_obj_align_to(tips, fcc_warnings, LV_ALIGN_BOTTOM_MID, 6, 36);
+    }
 }
 
 static void debug_event_cb(lv_event_t *event)

application/aem_watch/src/user_cfg/data_default_cfg.h

@@ -94,6 +94,9 @@ const static char *s_def_datetime_str = "2024-03-01 08:00:00"; // 默认系统
 // 恢复出厂设置后，是否重置内置表盘
 #define RESET_INSIDE_WF (1) // 0:不重置; 1:重置
 
+// 是否支持在桌面上滑出通知列表
+#define NOTIFY_LIST_ENABLE (0)
+
 // 固件支持的多语言
 #define MUTILANG1 0b10100000 // aem_table_lang1_support
 #define MUTILANG2 0b00       // aem_table_lang2_support

application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -5,7 +5,7 @@
 #define __DEVICE_INFO_CONFIG_H__
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
-#define MICRO_VERSION 1
+#define MICRO_VERSION 2
 #define DEVICE_ID "CJ01"//3085
 #define DEVICE_NAME "Catsights"//"3085S WATCH"
 #define DEVICE_NAME_UI "Catsights"//"3085S WATCH"

thirdparty/lib/aem/Kconfig

@@ -55,5 +55,10 @@ config AEM_BARO_SENSOR
 	default n
 	help
 	This aem barometer Sensor support
+config AEM_DEFENDER
+    bool "aem defender support"
+	default n
+	help
+	This aem defender support
 rsource "driver/Kconfig"
 endif

thirdparty/lib/aem/adapter/def_settings/aem_adapter_def_settings.c

@@ -24,7 +24,6 @@ const static aem_language_table_t s_aem_language_table[] =
 
 // 内置表盘id数组，第一个为默认表盘。跟项目走, 添加视频表盘, 空间调整为2M
 #ifdef CONFIG_BOARD_ATS3085S4_DEV_WATCH_EXT_NOR
-#ifndef CONFIG_SIMULATOR
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
     79,
@@ -35,30 +34,6 @@ const static uint32_t s_outside_wf[] = {
 };
 #else
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
-const static uint32_t s_inside_wf[] = {
-    10,
-};
-// 预置表盘，文件可删除
-const static uint32_t s_outside_wf[] = {
-    3,
-    4,
-    11,
-};
-#endif
-#else  
-#ifndef CONFIG_SIMULATOR
-// 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
-const static uint32_t s_inside_wf[] = {
-    10,
-};
-// 预置表盘，文件可删除
-const static uint32_t s_outside_wf[] = {
-    3,
-    4,
-    11,
-};
-#else
-// 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
     79,
 };
@@ -67,7 +42,6 @@ const static uint32_t s_outside_wf[] = {
     80,
 };
 #endif
-#endif  // CONFIG_BOARD_ATS3085S4_DEV_WATCH_EXT_NOR
 
 // 小部件配置
 const static aem_widgets_sort_item_t s_widgets[] = {

thirdparty/lib/aem/config/aem_project.h

@@ -4,7 +4,7 @@
 #pragma warning(error : 4013)
 #endif
 #define AEM_VERSION "BL_Develop_NOR"
-#define BUILD_TIME "202501151727"
+#define BUILD_TIME "202501171226"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1

thirdparty/lib/aem/include/aem_core_if.h

@@ -461,5 +461,12 @@ typedef struct
     aem_table_lang5_support lang5;
 } aem_lang_all_support_t;
 
+
+typedef struct
+{
+    aem_time_t time; // 写入时间
+    uint8_t mothod;  // 写入方式   0 pcba  1 ble
+    uint8_t is_pass; // 写入时是否校验通过  1 pass
+} aem_key_w_record_t;
 #pragma pack(pop)
 #endif

thirdparty/lib/aem/include/app_service/include/aem_app_comm.h

@@ -83,4 +83,9 @@ const char *aem_get_gui_fwk_lib_ver(void);
  **/
 void aem_goto_launch_flag(bool flag);
 
+
+bool aem_read_aem_key_record(aem_key_w_record_t *record);
+bool aem_write_aem_key_record(uint8_t mothod, uint8_t is_pass);
+
+uint16_t aem_factory_get_product_info(uint8_t *data, uint16_t in_len);
 #endif

thirdparty/lib/aem/include/framework/core/watch_fwk/watch_face/aem_watchface_mgr.h

@@ -9,7 +9,8 @@
 #define AEM_WIDGETS_MAX_SHOW_NUM 20 // 最大显示个数
 #define AEM_WIDGETS_MIN_SHOW_NUM 0	// 最小显示个数
 
-#define INSIDE_WF_ID_MIN 1001 // 内置源码表盘最小ID值
+#define INSIDE_WF_ID_MIN 1001	   // 内置源码表盘最小ID值
+#define DEF_WF_ID INSIDE_WF_ID_MIN // 默认表盘ID
 
 #define WF_MGR_MAGIC 0x87654231
 
@@ -69,6 +70,7 @@ typedef enum
 // 小部件可见性枚举
 typedef enum
 {
+	AEM_WF_INVALID,
 	AEM_WF_INVISIBLE,
 	AEM_WF_VISIBLE,
 } aem_widget_visible;