合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs

@@ -99,6 +99,24 @@
                listView.Height = bodyFrameLayout.Height;

                bodyFrameLayout.AddChidren(listView);



                //导轨长度为0时

                if (curtainData.CurtainLength <= 0)

                {

                    //电机数据异常,请重置电机

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uCurtainDataIsErrorPleaseResetCurtain));

                    try

                    {

                        //设备异常补救 -> 添加重置电机行

                        this.AddElectricalMachineryRow();

                        return;

                    }

                    catch (Exception ex2) 
                    {

                        HdlLogLogic.Current.WriteLog(ex2, "开合帘补救异常1");

                        return;

                    }

                }



                try

                {

                    //添加方向行

@@ -124,7 +142,7 @@
                        //设备异常补救 -> 添加重置电机行

                        this.AddElectricalMachineryRow();

                    }

                    catch (Exception ex2) { HdlLogLogic.Current.WriteLog(ex2, "开合帘补救异常"); }

                    catch (Exception ex2) { HdlLogLogic.Current.WriteLog(ex2, "开合帘补救异常2"); }

                }

            });

        }

@@ -706,7 +724,7 @@
            HdlGatewayReceiveLogic.Current.RemoveEvent("CurtainDeviceAttribute");



            //备份窗帘数据

            if (this.backupCurtainData == true)

            if (this.backupCurtainData == true && curtainData.CurtainLength > 0)

            {

                this.backupCurtainData = false;

                HdlThreadLogic.Current.RunThread(async () =>