增加是否激活恒爱库标识显示

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
index ffa7df2..f6cbda8 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
@@ -5,8 +5,8 @@
 
 #define FR8012HAQ_DEBUG  1
 #if FR8012HAQ_DEBUG == 1
-#define FR8012HAQ_LOG(msg, ...)      cplog_printf( msg, ##__VA_ARGS__)//printf( msg, ##__VA_ARGS__)//
-//#define FR8012HAQ_LOG(msg, ...)      printf( msg, ##__VA_ARGS__)//printf( msg, ##__VA_ARGS__)//
+//#define FR8012HAQ_LOG(msg, ...)      cplog_printf( msg, ##__VA_ARGS__)//printf( msg, ##__VA_ARGS__)//
+#define FR8012HAQ_LOG(msg, ...)      printf( msg, ##__VA_ARGS__)//printf( msg, ##__VA_ARGS__)//
 #else
 #define FR8012HAQ_LOG(msg, ...)  
 #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
index a84aec0..bd97ecb 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
@@ -184,7 +184,8 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
        lv_obj_set_width(bt_label, LV_HOR_RES - 20);
 #endif
     lv_label_set_align(bt_label, LV_LABEL_ALIGN_CENTER);
-       snprintf(info_str, 96, "bt:%s", fr8012haq_Versions_get());
+    extern char is_HA_activate ;//恒爱算法库是否激活
+       snprintf(info_str, 96, "bt:%s--%d", fr8012haq_Versions_get(),is_HA_activate);
        lv_label_set_text(bt_label, info_str);
 #ifdef USE_LV_WATCH_UI_CIRCLE
        #ifdef USE_LV_WATCH_UI_466_466