新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddDeviceForm.cs

@@ -95,7 +95,7 @@
                    this.AddRowLayout(listAllDevice[i], i != count);

                }

                //调整真实高度

                listView.AdjustRealHeight(Application.GetRealHeight(23));

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));

            });

        }



@@ -110,16 +110,16 @@
        /// <param name="addLine"></param>

        private void AddRowLayout(CommonDevice device, bool addLine)

        {

            string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);



            var rowContr = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(rowContr);



            //图标

            var btnIcon = rowContr.AddLeftIcon(81);

            Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);

            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);

            //设备名

            var btnName = rowContr.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 700);

            var btnName = rowContr.AddLeftCaption(HdlDeviceCommonLogic.Current.GetDeviceEpointName(device), 700);

            btnName.TextSize = 15;

            //右箭头

            rowContr.AddRightArrow();

@@ -184,7 +184,7 @@
        /// <param name="listInfo"></param>

        private void AddAlarmSettionDataToMemory(CommonDevice device, List<Safeguard.TaskListInfo> listInfo)

        {

            string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);

            if (listInfo == null || listInfo.Count == 0)

            {

                //指定为无动作模式