Merge branch 'master' of gitee.com:openLuat/LuatOS

demo/lbsLoc/main.lua

@@ -40,7 +40,6 @@ local function getLocCb(result, lat, lng, addr, time, locType)
 end
 
 sys.taskInit(function()
-    log.info("ipv6", mobile.ipv6(true))
     sys.waitUntil("IP_READY", 30000)
     while 1 do
         lbsLoc.request(getLocCb)
@@ -48,6 +47,31 @@ sys.taskInit(function()
     end
 end)
 
+-- -- 以下为wifi定位
+-- sys.subscribe("WLAN_SCAN_DONE", function ()
+--     local results = wlan.scanResult()
+--     log.info("scan", "results", #results)
+--     if #results > 0 then
+--         local reqWifi = {}
+--         for k,v in pairs(results) do
+--             log.info("scan", v["ssid"], v["rssi"], v["bssid"]:toHex())
+--             local bssid = v["bssid"]:toHex()
+--             bssid = string.format ("%s:%s:%s:%s:%s:%s", bssid:sub(1,2), bssid:sub(3,4), bssid:sub(5,6), bssid:sub(7,8), bssid:sub(9,10), bssid:sub(11,12))
+--             reqWifi[bssid]=v["rssi"]
+--         end
+--         lbsLoc.request(getLocCb,nil,nil,nil,nil,nil,nil,reqWifi)
+--     end
+-- end)
+
+-- sys.taskInit(function()
+--     sys.waitUntil("IP_READY", 30000)
+--     wlan.init()
+--     while 1 do
+--         wlan.scan()
+--         sys.wait(15000)
+--     end
+-- end)
+
 -- 用户代码已结束---------------------------------------------
 -- 结尾总是这一句
 sys.run()

script/libs/lbsLoc.lua

@@ -180,16 +180,18 @@ local function taskClient(cbFnc, reqAddr, timeout, productKey, host, port,reqTim
         socket.debug(netc, false)
         socket.config(netc, nil, true, nil)
         result = libnet.waitLink(d1Name, 0, netc)
-        result = libnet.connect(d1Name, 15000, netc, host, port)
+        result = libnet.connect(d1Name, 5000, netc, host, port)
         if result then
             while true do
                 log.info(" lbsloc socket_service connect true")
-                sys.wait(2000);
                 result, _ = libnet.tx(d1Name, 0, netc, reqStr) ---发送数据
                 if result then
                     result, param = libnet.wait(d1Name, 10000, netc)
                     if not result then
-                        log.info("服务器断开了", result, param)
+                        socket.close(netc)
+                        socket.release(netc)
+                        retryCnt = retryCnt+1
+                        if retryCnt>=3 then return cbFnc(4) end
                         break
                     end
                     succ, param, _, _ = socket.rx(netc, rx_buff) -- 接收数据