修复表盘下载的问题

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
index 4678952..9e81b0d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
@@ -385,7 +385,7 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
                                                 currentDialID); // 更新表盘设置
         //运动状态下不进行页面切换
         if (uapi_dev_runtime_get_train_status() != 1) {
-          NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+          // NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);// 目前切换到主界面，按键监听有问题
         }
 #ifdef SUPPORT_BLE_SERVICE
         svr_ble_read_data_value_updata_noyify(); // app切换表盘增加id更新

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 2950ef2..eb6faa4 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
@@ -3573,32 +3573,32 @@ void TraingModel::SetSportdata(SportData *data) {
  }
  
  int read_gps_data_(char *path, uint8_t *out_buf) {
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "=== 读取GPS数据开始 ===");
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS文件路径: %s", path);
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "=== 读取GPS数据开始 ===");
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GPS文件路径: %s", path);
  
    FILE *fp = fopen(path, "rb+");
    if (fp == NULL) {
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "错误: 无法打开GPS文件");
      return 0;
    }
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS文件打开成功");
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GPS文件打开成功");
  
    uint32_t file_size = 0;
    fseek(fp, 0, SEEK_END);
    file_size = ftell(fp);
    fseek(fp, 0, SEEK_SET);
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS文件大小: %u 字节", file_size);
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GPS文件大小: %u 字节", file_size);
  
    int len = 0;
    int point_count = 0;
    OHOS::GPSData_t data = {0};
  
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始读取GPS轨迹点...");
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "开始读取GPS轨迹点...");
    while (1) {
      int read_size = fread(&data, 1, sizeof(data), fp);
      if (read_size == sizeof(data)) {
        point_count++;
-       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
+       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
                      "读取GPS点 #%d: 时间戳=%u, 纬度=%.6f, 经度=%.6f",
                      point_count, data.timestamp, data.latitude, data.longitude);
  
@@ -3614,21 +3614,21 @@ void TraingModel::SetSportdata(SportData *data) {
        memcpy_s(out_buf + len, 4, &temp_longitude, sizeof(temp_longitude));
        len += 4;
  
-       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
+       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
                      "GPS点数据转换: 时间戳=%u, 纬度=%d, 经度=%d", temp_data,
                      temp_latitude, temp_longitude);
      } else {
-       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS文件读取结束，读取大小: %d",
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GPS文件读取结束，读取大小: %d",
                      read_size);
        break;
      }
    }
  
    fclose(fp);
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS文件关闭");
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GPS文件关闭");
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
                  "总共读取 %d 个GPS点，输出数据长度: %d 字节", point_count, len);
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "=== 读取GPS数据结束 ===");
+   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "=== 读取GPS数据结束 ===");
  
    return len;
  }

diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
index cdc203b..e27023f 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
@@ -1318,6 +1318,7 @@ static uint32_t BLE_TEST(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
         break;
     case 13:
         CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,(uint8_t *)&type_2,1);
+        break;
     case 14:
         if(type_2)
         uapi_open_voice_recognition( );