Просмотр исходного кода

add: libfota上传硬件版本信息

doudou 1 год назад
Родитель
Сommit
df555a963c
2 измененных файлов с 7 добавлено и 1 удалено
  1. 3 1
      script/libs/libfota.lua
  2. 4 0
      script/libs/libfota2.lua

+ 3 - 1
script/libs/libfota.lua

@@ -70,6 +70,7 @@ local function fota_task(cbFnc,storge_location, len, param1,ota_url,ota_port,lib
             if x and y and z then
                 version = x.."."..z
                 local imei = ""
+                local model = ""
                 if mobile then
                     imei = mobile.imei()
                 elseif wlan and wlan.getMac then
@@ -77,7 +78,8 @@ local function fota_task(cbFnc,storge_location, len, param1,ota_url,ota_port,lib
                 else
                     imei = mcu.unique_id():toHex()
                 end
-                ota_url = "http://iot.openluat.com/api/site/firmware_upgrade?project_key=" .. _G.PRODUCT_KEY .. "&imei=".. imei .. "&device_key=&firmware_name=" .. _G.PROJECT.. "_LuatOS-SoC_" .. rtos.bsp() .. "&version=" .. rtos.version():sub(2) .. "." .. version
+                model = hmeta and ("&model=" .. hmeta.model() .. "_" .. hmeta.hwver()) or ""
+                ota_url = "http://iot.openluat.com/api/site/firmware_upgrade?project_key=" .. _G.PRODUCT_KEY .. "&imei=".. imei .. "&device_key=&firmware_name=" .. _G.PROJECT.. "_LuatOS-SoC_" .. rtos.bsp() .. "&version=" .. rtos.version():sub(2) .. "." .. version .. model
             else
                 log.error("fota", "_G.VERSION must be xxx.yyy.zzz!!!")
                 cbFnc(5)

+ 4 - 0
script/libs/libfota2.lua

@@ -112,6 +112,8 @@ function libfota2.request(cbFnc, opts)
         opts.url = "http://iot.openluat.com/api/site/firmware_upgrade"
     end
     if opts.url:sub(1, 4) ~= "###" and not opts.url_done then
+        -- 获取硬件版本信息
+        local model = hmeta and ("&model=" .. hmeta.model() .. "_" .. hmeta.hwver()) or ""
         -- 补齐project_key函数
         if not opts.project_key then
             opts.project_key = _G.PRODUCT_KEY
@@ -145,6 +147,8 @@ function libfota2.request(cbFnc, opts)
 
         -- 然后拼接到最终的url里
         opts.url = string.format("%s?imei=%s&project_key=%s&firmware_name=%s&version=%s", opts.url, opts.imei, opts.project_key, opts.firmware_name, opts.version)
+        opts.url = opts.url .. model
+        
     else
         opts.url = opts.url:sub(4)
         opts.url_done = true