合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -99,15 +99,29 @@
                listView.Height = bodyFrameLayout.Height;

                bodyFrameLayout.AddChidren(listView);



                //添加方向行

                this.AddDirectionRow();

                //添加限位行

                this.AddLimitRow();

                //添加重置电机行

                this.AddElectricalMachineryRow();

                try

                {

                    //添加方向行

                    this.AddDirectionRow();

                    //添加限位行

                    this.AddLimitRow();

                    //添加重置电机行

                    this.AddElectricalMachineryRow();



                //限位数据接收

                this.ReceiveLimitData();

                    //限位数据接收

                    this.ReceiveLimitData();

                }

                catch (Exception ex)

                {

                    //Log出力

                    string msg = "当前激活的界面[" + UserCenterResourse.NowActionFormID + "]";

                    HdlLogLogic.Current.WriteLog(ex, msg);

                    //出现未知错误

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

                    this.listView.RemoveAll();

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

                    this.AddElectricalMachineryRow();

                }

            });

        }



@@ -588,6 +602,10 @@


                        //每10的长度大概是2秒,多预留1次出来

                        int waitCount = ((curtainData.CurtainLength / 10) + 1) * 3;

                        if (waitCount < 12)

                        {

                            waitCount = 12;

                        }



                        int timeCount = 0;

                        while (timeCount <= waitCount)