Merge #1535 into sdk602patch0911 from refs/changes/1535/head

系统：增加心率血氧运动字符串解析
系统：增加心率血氧运动字符串解析
系统：增加消息弹窗的功耗记录

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 1830424..0ed4c27 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1015,6 +1015,8 @@ void MsgCenterNotifyMessageProc(const Topic topic, Request* req)
       // nullptr, 0);
       OHOS::NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE);
       OHOS::NotificationManager::GetInstance()->ShowNotify(OHOS::CreateMessageView, TOPIC_EVENT_MESSAGENOTE, true);
+      //进行消息显示记录
+      uapi_save_runtime_log(RUNTIME_LOG_MSG_SHOW);
     }
 }
 

diff --git a/code/sdk/drivers/peripheral/utils/custom_save_runtime.h b/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
index fbc817f..a1df48c 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
+++ b/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
@@ -211,6 +211,11 @@ typedef enum {
   RUNTIME_LOG_RECORD_START_AI, // 0x1103 AI录音开始
   RUNTIME_LOG_RECORD_STOP_AI,  // 0x1104 AI录音停止
 
+  //消息
+  RUNTIME_LOG_MSG_MIN = 0x1200,
+  //消息显示
+  RUNTIME_LOG_MSG_SHOW,
+
 } runtime_log_cmd_Id;
 
 errcode_t uapi_save_runtime_log(uint16_t cmd);

diff --git a/tools/log_parser/runtimeanalysis.py b/tools/log_parser/runtimeanalysis.py
index 4ef7b3c..8478d42 100644 (file)
--- a/tools/log_parser/runtimeanalysis.py
+++ b/tools/log_parser/runtimeanalysis.py
@@ -10,11 +10,8 @@ os.makedirs(output_dir, exist_ok=True)
 # 定义输出文件的完整路径  \r
 output_file_path = os.path.join(output_dir, "runtimeout.txt")  \r
 \r
-# 定义默认的输入文件路径  \r
-default_txtname = "default_input.txt"  # 请将此处的文件名替换为你的默认输入文件名  \r
-\r
 # 从命令行参数中获取输入文件名称，如果没有提供则使用默认文件  \r
-txtname = sys.argv[-1] if len(sys.argv) > 1 else default_txtname  \r
+txtname = sys.argv[-1] \r
 \r
 # 字符串与其对应的消息的映射  \r
 str_bin_list = [  \r
@@ -39,7 +36,22 @@ str_bin_list = [
     ['1101', "录音开始 "],  \r
     ['1102', "录音停止 "],  \r
     ['1103', "AI录音开始 "],  \r
-    ['1104', "AI录音停止 "]  \r
+    ['1104', "AI录音停止 "],\r
+    ['0401',"手表发起运动"],\r
+    ['0402',"app发起运动"],\r
+    ['0403',"开始特殊运动"],\r
+    ['0404',"开始普通运动"],\r
+    ['0405',"停止运动"],\r
+    ['0406',"恢复运动"],\r
+    ['0407',"运动结束"],\r
+    ['0501',"主动检测心率"],\r
+    ['0502',"主动检测心率结束"],\r
+    ['0503',"被动检测心率"],\r
+    ['0504',"被动检测心率结束"],\r
+    ['0701',"主动检测血氧"],\r
+    ['0702',"主动检测血氧结束"],\r
+    ['1201',"消息弹窗显示"]\r
+      \r
 ]  \r
 \r
 # 打开输出文件以写入  \r
@@ -59,10 +71,10 @@ with open(output_file_path, "w+") as f_out:
                 if l[0] == data_1_bin:  \r
                     f_out.write(l[1])  \r
                     found = True  \r
-                    break  \r
-            \r
-            if not found:  \r
-                f_out.write(data_1_bin)  # 如果没有找到对应的字符串，则写入二进制字符串  \r
+                    break \r
+                 \r
+            f_out.write(' ')  \r
+            f_out.write(data_1_bin)  # 如果没有找到对应的字符串，则写入二进制字符串  \r
             f_out.write(' ')  \r
             f_out.write(data_2_bin)  \r
             f_out.write('\n')  \r