合并

diff --cc code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
Simple merge

diff --cc code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 89d52a4,1155c33..cb7691c
--- 1/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
--- 2/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
@@@ -315,10 -315,11 +315,14 @@@ static void custom_cmd_service_check_ta
          case CUSTOM_CMD_MSG_CAT1_AUDIO_STOP:
              cat1_audio_AudioRelease();
              break;
 -        
 +        case CUSTOM_CMD_MSG_CAT1_MIC_CTRL:
 +            PhoneAudioSetMicMuteCat1(mail.data[0]);
 +            break;
 +            
+         case CUSTOM_CMD_MSG_TYPE_AGING_TEST:
 -            HandleUpdatelcdMode(4);;
++            HandleUpdatelcdMode(4);
+             break;
+         
          default:
              PRINT("Unknown CUSTOM_CMD_MSG cmd 0x%02X \r\n", mail.cmd);
              break;

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.h
index 0143519,3a0b972..3c58459
--- 1/code/sdk/drivers/peripheral/utils/custom_utils.h
--- 2/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@@ -238,7 -238,7 +238,10 @@@ uint32_t uapi_calendar_store_date(void)
  
  #define CUSTOM_CMD_MSG_CAT1_AUDIO_STOP 0x14
  
 -#define CUSTOM_CMD_MSG_TYPE_AGING_TEST 0x15
 +#define CUSTOM_CMD_MSG_CAT1_MIC_CTRL 0x15
++
++#define CUSTOM_CMD_MSG_TYPE_AGING_TEST 0x16
++
  typedef enum {
      BR_HFP_CONNECT=1,
      BR_HFP_DISCONNECT,