From: hcj_ <1224667075@qq.com> Date: Mon, 6 May 2024 13:02:52 +0000 (+0800) Subject: 修改sjon_delete导致的死机 X-Git-Tag: release_V1.2.70_20241020_135402~1113^2~18^2~2 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F132%2Fhead;p=mirrors%2FFD230.git 修改sjon_delete导致的死机 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp index 8145ef388..2081d8e57 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp @@ -18,6 +18,7 @@ #include "cat1_server.h" #include "linux/delay.h" +//http://r-oss.thisiot.com/device-ota/2024_05_06/1787425705369333762.fwpkg?Expires=1714998097&OSSAccessKeyId=LTAI5tJa2arDBmqSUsSTQJ1T&Signature=eLmtuPN10YXS8pNUtJO2E2vt%2FPM%3D //https://test.app.api.thisiot.com/ota/task?deviceId=deviceId&sourceVersion=sourceVersion @@ -247,7 +248,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, ""); report_jsonString = cJSON_PrintUnformatted(data); - cJSON_Delete(data); + //cJSON_Delete(data); if(data!=NULL) { @@ -256,7 +257,7 @@ namespace OHOS if(downloadFileVo!=NULL) { - //"https://r-oss.thisiot.com/device-ota/2024_04_22/1782329689464958978.fwpkg?Expires=1713780167&OSSAccessKeyId=LTAI5tJa2arDBmqSUsSTQJ1T&Signature=OlbdNsfnz9Zje6ypFgXINQPXVE0%3D" + //"http://r-oss.thisiot.com/device-ota/2024_04_22/1782329689464958978.fwpkg?Expires=1713780167&OSSAccessKeyId=LTAI5tJa2arDBmqSUsSTQJ1T&Signature=OlbdNsfnz9Zje6ypFgXINQPXVE0%3D" char *uri = cJSON_GetObjectItem(downloadFileVo, "url")->valuestring; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uri %s",uri); sprintf((char *)uri_ota_package,"%s",uri); @@ -1022,7 +1023,7 @@ namespace OHOS } display_api->set_screen_set_keepon_timeout(-1); memset(uri,0,256); - imei_str= const_cast(ConfigModel::GetInstance()->Getimei().c_str()); + imei_str= const_cast(ConfigModel::GetInstance()->Getimei().c_str());//"864430010001091";//const_cast(ConfigModel::GetInstance()->Getimei().c_str()); //https://test.app.api.thisiot.com/ota/task?deviceId=deviceId&sourceVersion=sourceVersion // 860132060347507 // v1.1_20240419_152549