合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs

@@ -13,7 +13,6 @@
        /// </summary>
        public async System.Threading.Tasks.Task<AddedDeviceBindResponseAllData> AddDeviceBindAsync(AddBindData addBindData)
        {

            return await System.Threading.Tasks.Task.Run(async () =>
            {
                var result = new AddedDeviceBindResponseAllData();
@@ -91,9 +90,9 @@
                            {
                                var dInfo = new JObject{
                            { "BindMacAddr",bindInfo.BindMacAddr},
                         { "BindEpoint", bindInfo.BindEpoint} ,
                         { "BindCluster", bindInfo.BindCluster} ,
                         { "BindType",bindInfo.BindType}
                            { "BindEpoint", bindInfo.BindEpoint} ,
                            { "BindCluster", bindInfo.BindCluster} ,
                            { "BindType",bindInfo.BindType}
                            };
                                bindList.Add(dInfo);
                            }
@@ -101,15 +100,15 @@
                            {
                                var dInfo = new JObject{
                             { "BindCluster", bindInfo.BindCluster} ,
                         { "BindType",bindInfo.BindType},
                         { "BindScenesId", bindInfo.BindScenesId}
                             { "BindType",bindInfo.BindType},
                             { "BindScenesId", bindInfo.BindScenesId}
                            };
                                bindList.Add(dInfo);
                            }
                        }
                        var data = new JObject{
                    {"BindName",addBindData.BindName},
                    { "BindList", bindList }
                            {"BindName",addBindData.BindName},
                             { "BindList", bindList }
                    };
                        jObject.Add("Data", data);
                        //ZbGateway.MainGateWay.CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo?.gwID;
@@ -128,7 +127,21 @@
                    {
                        continue;
                    }
                    if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
                    if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
                    {
                        if (result.addBindResultResponseData != null)
                        {
                            break;
                        }
                    }
                    else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
                    {
                        if (result.addBindResultResponseData != null)
                        {
                            break;
                        }
                    }
                    else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
                    {
                        if (result.addBindResultResponseData != null)
                        {
@@ -406,7 +419,6 @@
                }
                catch { }


                var dateTime = DateTime.Now;
                while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
                {
@@ -415,7 +427,21 @@
                    {
                        continue;
                    }
                    if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
                    if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
                    {
                        if (responseData.removeBindResultResponseData != null)
                        {
                            break;
                        }
                    }
                    else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
                    {
                        if (responseData.removeBindResultResponseData != null)
                        {
                            break;
                        }
                    }
                    else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 4).Count)
                    {
                        if (responseData.removeBindResultResponseData != null)
                        {
@@ -427,14 +453,12 @@
                        break;
                    }
                }

                if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
                {
                    responseData.errorMessageBase = "回复超时，请重新操作";
                }
                mainGateway.Actions -= action;
                System.Console.WriteLine("DeviceBind/DelBind_Actions 退出" + System.DateTime.Now.ToString());

                return responseData;
            });
        }