xts版本提交，已经能够跑xts测试了但有报错

diff --git a/code/sdk/application/brandy/brandy_standard/service_init.c b/code/sdk/application/brandy/brandy_standard/service_init.c
index 6ed3503..86d7126 100644 (file)
--- a/code/sdk/application/brandy/brandy_standard/service_init.c
+++ b/code/sdk/application/brandy/brandy_standard/service_init.c
@@ -179,9 +179,9 @@ static void register_at_service(void)
 #endif\r
 \r
 #ifdef SUPPORT_AT_CUSTOMUTILS\r
-    uint32_t custom_utils_cmd_count;\r
-    at_cmd_table_t *custom_utils_table = get_custom_utils_cmd_table(&custom_utils_cmd_count);\r
-    at_cmd_add_moudle(custom_utils_table, custom_utils_cmd_count);\r
+    // uint32_t custom_utils_cmd_count;\r
+    // at_cmd_table_t *custom_utils_table = get_custom_utils_cmd_table(&custom_utils_cmd_count);\r
+    // at_cmd_add_moudle(custom_utils_table, custom_utils_cmd_count);\r
 #endif\r
 #ifdef SUPPORT_AT_CAT1\r
     uint32_t cat1_cmd_count;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/codedlock/include/CodedLockModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/codedlock/include/CodedLockModel.h
index 3399467..b31b933 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/codedlock/include/CodedLockModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/codedlock/include/CodedLockModel.h
@@ -14,7 +14,9 @@
  #include <queue>
  #include <iostream>
  #include <unordered_map>
+ #ifdef BLE_INSTRUCT
  #include "bleInstruct.h"
+ #endif
  
  namespace OHOS
  {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/makephone/src/CallingView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/makephone/src/CallingView.cpp
index a55e4e3..dad94ea 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/makephone/src/CallingView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/makephone/src/CallingView.cpp
@@ -376,7 +376,7 @@ void CallingView::showdial(bool flag)
 void CallingView::text_updata_buf(const char *buf)
 {
     if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourceCat1){
-    SendDtfmStrNumberToCat1(buf[0]);
+    // SendDtfmStrNumberToCat1(buf[0]);
     }
     else{
     uapi_hfp_send_DTMF_CODE(buf[0]);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageModel.cpp
index 42d3462..a371925 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageModel.cpp
@@ -319,7 +319,9 @@ uint8_t MessageModel::GetMessageCount() const { return numberOfItems; }
 // 加载Message文件
 bool MessageModel::LoadMessagesFromStorage() {
   // 加载消息过滤文件
+  #ifdef SUPPORT_BLE_SERVICE
   filtration_file_read();
+  #endif
 
   std::ifstream file(MESSAGE_JSON_FILE);
   if (!file.is_open()) {
@@ -408,7 +410,9 @@ bool MessageModel::LoadMessagesFromStorage() {
 // 保存Message文件
 bool MessageModel::SaveMessagesToStorage() {
   // 消息过滤文件保存
+  #ifdef SUPPORT_BLE_SERVICE
   filtration_file_save();
+  #endif
   if (MessageVector.empty()) {
     // 清空文件
     std::ofstream file(MESSAGE_JSON_FILE,

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
index 699bd39..2517e36 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -844,11 +844,15 @@
  #endif
      /*运动结束并且是手表发起的运动*/
      if (Openingway == false) {
+       #ifdef SUPPORT_BLE_SERVICE
        sendtraningstateend();
+       #endif
      }
      /*运动结束并且是app发起的运动*/
      else {
+       #ifdef SUPPORT_BLE_SERVICE
        sendtraningstatedata(0, sportdata->duration);
+       #endif
      }
  
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "结束运动");

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/uiservice/src/ui_service.cpp
index 234ef6d..2e9cc1e 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/uiservice/src/ui_service.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/uiservice/src/ui_service.cpp
@@ -633,8 +633,8 @@ void HandleUpdateDialState(Request *request)
 void HandleUpdatelcdMode(int type)
 {
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateSilentMode");
-    GraphicService::GetInstance()->PostGraphicEvent(
-        std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type));
+    // GraphicService::GetInstance()->PostGraphicEvent(
+    //     std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type));
 }
 
 static void HandleUpdateAlarmInfo(Request *request)

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
index f09ea4f..b2d1ee7 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
@@ -136,8 +136,8 @@
  #ifdef SUPPORT_CYWEE_SERVICE
      // {TOPIC_EVENT_ACTIVITY_UPDATE,PRIORITY_TWO},
      // {TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE,PRIORITY_TWO},
-     {TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,PRIORITY_TWO},
-     {TOPIC_EVENT_INACTIVITY_UPDATE,PRIORITY_TWO},
+    //  {TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,PRIORITY_TWO},
+    //  {TOPIC_EVENT_INACTIVITY_UPDATE,PRIORITY_TWO},
      // {TOPIC_EVENT_INACTIVITY_ACCUMULATE_TIME_UPDATE,PRIORITY_TWO},
  #endif
      {TOPIC_EVENT_GOAL_SHOW_VIEW,PRIORITY_TWO},
@@ -196,8 +196,8 @@
      MsgCenterSubscribeTopic(TOPIC_EVENT_HFP_HINT);
      // MsgCenterSubscribeTopic(TOPIC_EVENT_ACTIVITY_UPDATE);
      // MsgCenterSubscribeTopic(TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE);
-     MsgCenterSubscribeTopic(TOPIC_EVENT_AR_ALERT_TYPE_UPDATE);
-     MsgCenterSubscribeTopic(TOPIC_EVENT_INACTIVITY_UPDATE);
+    //  MsgCenterSubscribeTopic(TOPIC_EVENT_AR_ALERT_TYPE_UPDATE);
+    //  MsgCenterSubscribeTopic(TOPIC_EVENT_INACTIVITY_UPDATE);
      // MsgCenterSubscribeTopic(TOPIC_EVENT_INACTIVITY_ACCUMULATE_TIME_UPDATE);
      MsgCenterSubscribeTopic(TOPIC_EVENT_BLE_TRAINING);
      MsgCenterSubscribeTopic(TOPIC_EVENT_BLE_TRANSMIT);
@@ -622,11 +622,11 @@
      }
  
      
-     if(IsTestCHANGINGViewCreated())
-     {
-         ChangeViewcolorC(1);
-     }
-     else
+    //  if(IsTestCHANGINGViewCreated())
+    //  {
+    //      ChangeViewcolorC(1);
+    //  }
+    //  else
      {
          if (CheckPriority(topic) && !uapi_dev_runtime_get_factory_test_status_flag()) //产测模式不弹充电弹窗
          {
@@ -654,16 +654,16 @@
      }
  #if DIALDATASET
      // DialModelCharge::GetInstance()->UpdatechargeStatus(0);
-     setChargeStatus(0);
+    //  setChargeStatus(0);
  #endif
      SaveEleModel::GetInstance()->SetChargeStatus(false);
  
  
-     if(IsTestCHANGINGViewCreated())
-     {
-         ChangeViewcolorC(0);
-     }
-     else
+    //  if(IsTestCHANGINGViewCreated())
+    //  {
+    //      ChangeViewcolorC(0);
+    //  }
+    //  else
      {
          if(is_UIViewGroup_charge())
          {
@@ -1507,26 +1507,26 @@
  //APP运动相关
  void MsgCenterNotifybleAPPtraining(const Topic topic, Request* req)
  {
-     unused(topic);
-      uint8_t* data=(uint8_t*)req->data;
-     if(data!=NULL && req->len>=2)
-     {
-         switch (data[1])
-         {
-             case START://运动开始
+    //  unused(topic);
+    //   uint8_t* data=(uint8_t*)req->data;
+    //  if(data!=NULL && req->len>=2)
+    //  {
+    //      switch (data[1])
+    //      {
+    //          case START://运动开始
  
-             break;
-             case STOP://运动暂停
+    //          break;
+    //          case STOP://运动暂停
  
-             break;
-             case RECOVER://运动恢复
+    //          break;
+    //          case RECOVER://运动恢复
  
-             break;
+    //          break;
  
-             case END://运动结束
-             break;
-         }
-     }
+    //          case END://运动结束
+    //          break;
+    //      }
+    //  }
  
      // unused(req);
  
@@ -1551,8 +1551,8 @@
  #ifdef SUPPORT_CYWEE_SERVICE
      // {TOPIC_EVENT_ACTIVITY_UPDATE,       MsgCenterNotifyActivityProc},
      // {TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE,       MsgCenterNotifyActivityExtraInfoProc},
-     {TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,       MsgCenterNotifyArAlertProc},
-     {TOPIC_EVENT_INACTIVITY_UPDATE,       MsgCenterNotifyInactivityProc},
+    //  {TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,       MsgCenterNotifyArAlertProc},
+    //  {TOPIC_EVENT_INACTIVITY_UPDATE,       MsgCenterNotifyInactivityProc},
      // {TOPIC_EVENT_INACTIVITY_ACCUMULATE_TIME_UPDATE,       MsgCenterNotifyInactivityAccumulateTimeProc},
  #endif
      // {TOPIC_EVENT_GOAL_SHOW_VIEW,    MsgCenterNotifygoalnotificationviewProc},//编译不过

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
index 476361f..a40c182 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
@@ -926,16 +926,24 @@ namespace OHOS
             if (toggleButtonOffline->GetState() == false) {
                 uapi_dev_runtime_set_hrs_ble_status(0);
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"hrs_ble_switch false");
+                #ifdef SUPPORT_BLE_SERVICE
                 custom_ble_service_stop();
+                #endif
                 LOS_Msleep(500);
+                #ifdef SUPPORT_BLE_SERVICE
                 custom_ble_service_start();
+                #endif
             }
             else {
                 uapi_dev_runtime_set_hrs_ble_status(1);
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"hrs_ble_switch true");
+                #ifdef SUPPORT_BLE_SERVICE
                 custom_ble_service_stop();
+                #endif
                 LOS_Msleep(500);
+                #ifdef SUPPORT_BLE_SERVICE
                 custom_ble_service_start();
+                #endif
             }
           } else {
              WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"组件不存在");

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 8fedf75..b21e95b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -182,7 +182,7 @@ target = {
         'ssb_version': 'brandy-ssb-xts',
         'dsp_version': 'max',
         'packet': True,
-        'fs_image': False
+        # 'fs_image': False
     },
 
     'brandy-target1-r': {
@@ -1101,7 +1101,8 @@ target = {
 
     ################# FD272 ############################
     'brandy-native-js-fd272': {
-        'base_target_name': 'brandy-native-js',
+        # 'base_target_name': 'brandy-native-js',
+        'base_target_name': 'brandy-xts',
         #自定义配置项，选择硬件及功能参数
         'defines': [
             'BOARD_FD272',
@@ -1110,14 +1111,14 @@ target = {
             # 'SUPPORT_CAT1_SERVICE',
             
             'CONFIG_EFUSE_READ_TO_RAM',
-             'CUSTOM_UTILS',
+            # 'CUSTOM_UTILS',
             # 'CUSTOM_HID_SERVICE',
             # 'WEARABLE_LOG_DEBUG',
             'SUPPORT_RC_CALIBRATION',
             'VIB_USE_PWM',
             'CONFIG_PWM_SUPPORT',
             # 'ACC_LIS2DOC',
-            'ENABLE_CUSTOM_I2C',
+            # 'ENABLE_CUSTOM_I2C',
             #'ENABLE_VIBRATOR',
             'ENCODER_SUPPORT',
             # 'SUPPORT_SPO2_NOTIFICATION',
@@ -1127,17 +1128,17 @@ target = {
             # 'ENABLE_SHAPING',
             'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
             # 'SUPPORT_AT_CUSTOMUTILS',
-            'SUPPORT_BLE_SERVICE',
+            # 'SUPPORT_BLE_SERVICE',
             # 'SUPPORT_MAG_SERVICE',
-            'SUPPORT_PPG_SERVICE',
-            'SUPPORT_CYWEE_SERVICE',
+            # 'SUPPORT_PPG_SERVICE',
+            # 'SUPPORT_CYWEE_SERVICE',
             'SUPPORT_BATTERY_SERVICE',
             'CUSTOM_ZHIHUI',
             # 'SUPPORT_AUTO_OTA_SERVER',
             # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
             #"MEM_CHECK",
             #'ENABLE_WEBSOCKET',
-            'CYWEE_MAC_ACTIVE',                        
+            # 'CYWEE_MAC_ACTIVE',                      
             #'SUPPORT_HID_SERVICE',
             'SUPPORT_BAIDU_MAP',
             'CFG_FLASH_SIZE=16',
@@ -1147,29 +1148,29 @@ target = {
             'TPTYPE_CST92XX',
             # 'ROTARYENCODER_HX3507',
             'NANDFLASH_DS35X',
-            'BLE_INSTRUCT',
+            # 'BLE_INSTRUCT',
             # 'AILPAY_SUPPORT',
-            'SUPPORT_FACTORY_SERVICE',
+            # 'SUPPORT_FACTORY_SERVICE',
             # 'MEMORY_CORRUPTION',
             'SAP_EFFECT_SWS_SUPPORT',
             'AUDIO_SMARTPA_AW88082',
             '-:SUPPORT_LWIP',
             'ENABLE_HP4507',
-            'SUPPORT_GNSS',
+            # 'SUPPORT_GNSS',
             'DISABLE_UART_LOG',
-            'CONFIG_GNSS_UART_WITH_FLOWCTRL',
+            # 'CONFIG_GNSS_UART_WITH_FLOWCTRL',
             # 'DOWNLOAD_GNSS_SWITCH',
-            'PPG_HX3695',
+            # 'PPG_HX3695',
             'ROTARYENCODER_HX3508',
             '-:SUPPORT_ALIPAY_SEC',
         ],
         #添加自定义应用
        'ram_component': [
-                          'audio_at_service', 
-                          'media_at_service', 
-                          'bt_manager_at_service',
-                           "ppg_sensor_hx3695",
-                          "ppgBleService",
+                        #   'audio_at_service', 
+                        #   'media_at_service', 
+                        #   'bt_manager_at_service',
+                        #    "ppg_sensor_hx3695",
+                        #   "ppgBleService",
                         #    "mag_sensor_mmc5603",
                         # "mag_sensor_qmc6309",
                           "vibrator",
@@ -1178,7 +1179,7 @@ target = {
                         #   "cat1Service",
                         #   "cat1Test",
                         #   "4gTestcpp",
-                          "audio_manager",
+                        #   "audio_manager",
                           "CustomUIcomponentTool",
                           "nativeabilityfwk",
                           "custom_utils",
@@ -1186,8 +1187,8 @@ target = {
                           "custom_config",
                           "rotary_encoder",
                            "nativelauncher",
-                            "ppg_service",
-                            "cywee_service",
+                            # "ppg_service",
+                            # "cywee_service",
                            "batterry_service",
                         #    "AIsystem",
                         #    "AImain",
@@ -1195,22 +1196,22 @@ target = {
                         #    "AIagent",
                         #    "AIota",
                         #    "AIsdk",
-                           "bleservice",
-                           "blemoder",
-                           "transspecard",
-                           "factorytest_service",
+                        #    "bleservice",
+                        #    "blemoder",
+                        #    "transspecard",
+                        #    "factorytest_service",
                         #    "hid_service",
-                           "producttest",
-                            "ppg_hal",
+                        #    "producttest",
+                            # "ppg_hal",
                             # "mag_service",
-                            "cywee_dml",
-                            "cyweeBleService",
-                            "charge_ic_hp4570",
-                            "gnss",
-                            "pgnss_sample",
+                            # "cywee_dml",
+                            # "cyweeBleService",
+                            # "charge_ic_hp4570",
+                            # "gnss",
+                            # "pgnss_sample",
                             # "gnss_sample",
-                            "cyweeBleService",
-                            "aiMediaService",
+                            # "cyweeBleService",
+                            # "aiMediaService",
                            ],
                'image_analysis': False,
                'fs_image_path':'fd272',
@@ -1219,7 +1220,8 @@ target = {
                'fs_image': True
     },
     'brandy-native-js-fd272-r': {
-        'base_target_name': 'brandy-native-js-r',
+        # 'base_target_name': 'brandy-native-js-r',
+        'base_target_name': 'brandy-xts-r',
         #自定义配置项，选择硬件及功能参数
         'defines': [
                     'BOARD_FD272',

diff --git a/code/sdk/middleware/services/gui/hal/display/src/display_gralloc.c b/code/sdk/middleware/services/gui/hal/display/src/display_gralloc.c
index ac1fe2f..9f88b8c 100644 (file)
--- a/code/sdk/middleware/services/gui/hal/display/src/display_gralloc.c
+++ b/code/sdk/middleware/services/gui/hal/display/src/display_gralloc.c
@@ -234,7 +234,7 @@ static int32_t AllocMem(const AllocInfo *info, BufferHandle **handle)
     if ((pool == g_poolId) && (g_tryToFreeImgCallback != NULL)) {
         while (addr == NULL) {
             if (g_tryToFreeImgCallback()) {
-                DISP_LOGW("Success to free image during AllocMem size: %u\n", buffer->size);
+                // DISP_LOGW("Success to free image during AllocMem size: %u\n", buffer->size);
                 addr = LosAllocMem(pool, (uint32_t)(buffer->size));
             } else {
                 DISP_LOGE("Failed to AllocMem size: %u, and no image can be free\n", buffer->size);

diff --git a/code/sdk/zhihui/utils/CMakeLists.txt b/code/sdk/zhihui/utils/CMakeLists.txt
index 723f664..a408dc2 100644 (file)
--- a/code/sdk/zhihui/utils/CMakeLists.txt
+++ b/code/sdk/zhihui/utils/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SOURCES
     # ${CMAKE_CURRENT_SOURCE_DIR}/custom_sysapi.c
     # ${CMAKE_CURRENT_SOURCE_DIR}/custom_boot_service.c
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_utils.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/custom_utils_at_cmd.c
+    # ${CMAKE_CURRENT_SOURCE_DIR}/custom_utils_at_cmd.c
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_fileoperate_service.c
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_cmd_service.c
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_runtime.c

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index 666688c..451ad8e 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -3086,7 +3086,8 @@ int custom_exit_lpm(void)
 int32_t uapi_microhone_switch(bool isopen)
 {
     #ifdef CUSTOM_ZHIHUI
-        return microhone_switch(isopen);
+        // return microhone_switch(isopen);
+        return 0;
     #else
         return 0;
     #endif
@@ -3103,7 +3104,7 @@ void uapi_check_spk(uint8_t isopen)
 void uapi_check_mic(bool isopen)
 {
     #ifdef CUSTOM_ZHIHUI
-        check_mic(isopen);
+        // check_mic(isopen);
     #endif
 }
 

diff --git a/code/sdk/zhihui/utilscpp/CMakeLists.txt b/code/sdk/zhihui/utilscpp/CMakeLists.txt
index 1c02c17..8b5a923 100644 (file)
--- a/code/sdk/zhihui/utilscpp/CMakeLists.txt
+++ b/code/sdk/zhihui/utilscpp/CMakeLists.txt
@@ -11,7 +11,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/spi_protocol.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/spi_protocol_api.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/spi_protocol_test.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/audio_test.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/audio_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/pcm_volume_calculator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/bt_scan_test.cpp