2021-3-16-5

陈嘉乐

2021-03-16 902f19750cbf3e0e3dba7139947421ecb461f93f

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -50,15 +50,15 @@
                return _msg_id++;
            }
        }
        /// <summary>
        /// 获取13位时间戳
        /// </summary>
        /// <returns></returns>
        public string Get_TimeStamp()
        {
            long t = DateTime.Now.Ticks / 10000;
            return t.ToString();
        }
        ///// <summary>
        ///// 获取13位时间戳
        ///// </summary>
        ///// <returns></returns>
        //public string Get_TimeStamp()
        //{
        //    long t = DateTime.Now.Ticks / 10000;
        //    return t.ToString();
        //}

        /// <summary>
        /// 是否搜索本地网关成功
@@ -229,7 +229,7 @@
        public void SearchLoaclGateway()
        {
            //2021-01-15 : 住宅没有绑定网关的时候不用搜索，并且不能链接mqtt
            if(DB_ResidenceData.Instance.HomeGateway == null)
            if(DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
            {
                return;
            }
@@ -603,6 +603,7 @@
                }

                MainPage.Log($"局域网信息: {receiveObj.Topic}");
                MainPage.Log($"内容: {res[1]}");


                //验证有效数据长度
@@ -613,13 +614,14 @@
                //}
                receiveObj.BodyDataString = res[1];

                var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                if (bodyJObj == null)
                {
                    return receiveObj;
                }
                if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
                {
                    var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                    if (bodyJObj == null)
                    {
                        return receiveObj;
                    }

                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
                    {
@@ -643,6 +645,11 @@
                {
                    //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
                    UpdataFunctionStatus(receiveObj.BodyDataString, null);
                }
                else
                {
                    //一些特殊的主题处理(为了执行速度,尽可能的别加耗时的操作)
                    Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(receiveObj.Topic, receiveObj.BodyDataString);
                }
            }
            return receiveObj;
@@ -689,6 +696,7 @@
                        MainPage.Log($"A协议更新状态:{revString}");
                        foreach (var attr in updateTemp.status)
                        {
                            localFunction.time_stamp = temp.time_stamp;
                            localFunction.SetAttrState(attr.key, attr.value);
                        }