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

demo/air780epvh_gnsstest/hdgnss.lua

@@ -132,8 +132,8 @@ local function exec_agnss()
 
     -- 发起基站定位, 暂时禁用
     if mobile and false then
-        mobile.reqCellInfo(6000)
-        sys.waitUntil("CELL_INFO_UPDATE", 3000)
+        mobile.reqCellInfo(6)
+        sys.waitUntil("CELL_INFO_UPDATE", 6000)
         local lat2, lng2, t = lbsLoc2.request(5000)
         log.info("hdgnss", "基站定位结果", lat2, lng2)
         if lat2 and lng2 then

script/turnkey/hz201p/ThingsCloud.lua

@@ -65,7 +65,7 @@ local function mqttConnect()
     local retryCount = 0
     logger.info("ThingsCloud connecting...")
 
-    mqttc = mqtt.create(nil, host, port, false)
+    mqttc = mqtt.create(nil, host, port, false, {rxSize = 4096})
     mqttc:auth(mobile.imei(), accessToken, projectKey)
     mqttc:keepalive(300)
     mqttc:autoreconn(true, 10000)

script/turnkey/hz201p/attributes.lua

@@ -17,6 +17,8 @@ local attributes = {
     rsrp = 0,
     rsrq = 0,
     vbat = 0,
+    audioStatus = "空闲",
+    callStatus = "不支持",
 }
 
 --已修改的数据，缓存在这里，等待上报

script/turnkey/hz201p/battery.lua

@@ -1,5 +1,5 @@
 function voltage_to_percentage(voltage)
-    local min_voltage = 3400
+    local min_voltage = 3600
     local max_voltage = 4190
 
     if voltage <= min_voltage then

script/turnkey/hz201p/ccVolte.lua

@@ -7,8 +7,11 @@ sys.subscribe("CC_IND", function(state)
         cnt = cnt + 1
         if cnt > 1 then
             cc.accept(0)
+            attributes.set("callStatus", "通话中")
         end
     elseif state == "HANGUP_CALL_DONE" or state == "MAKE_CALL_FAILED" or state == "DISCONNECTED" then
+        attributes.set("callStatus", "已就绪")
+        sys.publish("CC_DONE")
         audio.pm(0, audio.STANDBY)
         -- audio.pm(0,audio.SHUTDOWN)	--低功耗可以选择SHUTDOWN或者POWEROFF，如果codec无法断电用SHUTDOWN
     end
@@ -63,6 +66,7 @@ sys.taskInit(function()
     sys.publish("AUDIO_SETUP_DONE")--音频初始化完毕了
     sys.waitUntil("CC_READY")
     ccReady = true
+    attributes.set("callStatus", "已就绪")
     sys.wait(100)
 end)
 
@@ -75,11 +79,15 @@ sys.taskInit(function()
         if cmd == "call" then
             if ccReady then
                 cc.dial(0,param) --拨打电话
+                attributes.set("callStatus", "通话中")
+                attributes.set("audioStatus", "通话中")
+                sys.waitUntil("AUDIO_SETUP_DONE")
             else
                 log.info("audio", "cc not ready")
             end
         elseif cmd == "music" then
             local result = audio.play(0, "/luadb/yuan.amr")
+            attributes.set("audioStatus", "播放中")
             log.info("audio", "play music",result)
             sys.wait(1000)
             if not audio.isEnd(0) then
@@ -87,6 +95,11 @@ sys.taskInit(function()
                 audio.playStop(0)
             end
             audio.pm(0, audio.STANDBY)
+            attributes.set("audioStatus", "空闲")
         end
     end
 end)
+
+audio.on(0, function(audio_id, msg)
+    log.info("msg", audio_id, msg)
+end)