Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -20,7 +20,7 @@
            {
                case 0:
                    {
                     


                        ////new一个新逻辑对象；
                        ////新增正常自动化入口
@@ -62,11 +62,11 @@
                        doorLockLogicList.Show();
                    }
                    break;
              

            }

        }
        


        #region ◆ 自动化__________________________
        /// <summary>
@@ -398,7 +398,7 @@
                    //实现android显示逻辑列表的圆角;
                    fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
                    logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
                   

                }
                i++;
                var logicnameBtn = new Button
@@ -780,7 +780,6 @@
            }
            return _if;
        }
       

    }
}