发布到商店的版本

黄学彪

2020-08-21 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs

@@ -76,7 +76,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                var listBind = ModelData.DeviceModelDataLogic.Current.GetDeviceBindList(device, "Bind/GetDeviceBind");

                var listBind = TemplateData.TemplateDeviceDataLogic.Current.GetDeviceBindList(device);

                return new BindObj.GetDeviceBindResponseAllData()

                {

                    getAllBindResponseData = new BindObj.GetDeviceBindResponseData

@@ -177,7 +177,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");

                return TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, null);

            }



            var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);

@@ -191,7 +191,33 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");

            TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);

            var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);

            return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };

        }



        /// <summary>

        ///设备绑定【一对一 绑定，一个按键回路只能绑定一个设备】

        /// </summary>

        public BindObj.AddedDeviceBindResponseAllData AddDeviceSingleBindAsync(BindObj.AddBindData addBindData)

        {

            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");

            }



            var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);

            //获取发送的命令字符

            var sendData = this.GetAddDeviceListBindCommandText(addBindData);

            //发送 
            var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Bind/SetSingleBind", sendData, "Bind/SetSingleBind_Respon", 20);

            if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)

            {

                return null;

            }

            //修改缓存

            TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);



            var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);

            return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };

@@ -420,7 +446,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);

                return TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);

            }

            var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);

            //获取需要发送的数据

@@ -447,7 +473,7 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);

            TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);



            return responseData;

        }

@@ -460,7 +486,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.ClearDeviceAllBind(device);

                return TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);

            }



            var jObject = new JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };

@@ -472,7 +498,7 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.ClearDeviceAllBind(device);

            TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);



            var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.ClearBindInfoResponseData>(result.ReceiptData);

            return new BindObj.ClearBindInfoResponseAllData { clearBindInfoResponseData = tempData };

@@ -660,7 +686,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, "SetWritableValue");

                return TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, null);

            }

            //获取发送数据

            var sendData = this.GetConfigureHdlKeyCommandText(device.DeviceAddr, device.DeviceEpoint, value, clusterID);

@@ -671,7 +697,7 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, "SetWritableValue");

            TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, result.JsonData[0]);



            var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(result.ReceiptData);

            return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };

@@ -685,7 +711,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.ReadPanelConfigureKeyModel(device);

                return TemplateData.TemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);

            }



            var JObject = new JObject {{ "DeviceAddr",device.DeviceAddr },{ "Epoint", device.DeviceEpoint },