2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -69,7 +69,7 @@
            frameBack.Height = Application.GetRealHeight(1300);

            frameBack.Y = Application.GetRealHeight(444);

            frameBack.BackgroundColor = 0xa1ffffff;

            frameBack.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            frameBack.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            bodyFrameLayout.AddChidren(frameBack);



            //桌布控件

@@ -117,6 +117,7 @@
            btnSensor.TextSize = 16;

            btnSensor.TextAlignment = TextAlignment.Center;

            btnSensor.TextColor = UserCenterColor.Current.TextColor2;

            btnSensor.IsBold = true;

            frameSensor.AddChidren(btnSensor, ChidrenBindMode.BindEventOnly);

            //底线

            var btnSensorLine = new NormalViewControl(40, 10, true);

@@ -132,8 +133,10 @@
                //字体大小和颜色变更

                btnSensor.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnSensor.TextSize = 14;

                btnSensor.IsBold = false;

                btnLog.TextColor = UserCenterColor.Current.TextColor2;

                btnLog.TextSize = 16;

                btnLog.IsBold = true;



                btnLogLine.Visible = true;

                btnSensorLine.Visible = false;

@@ -150,8 +153,10 @@
                //字体大小和颜色变更

                btnSensor.TextColor = UserCenterColor.Current.TextColor2;

                btnSensor.TextSize = 16;

                btnSensor.IsBold = true;

                btnLog.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnLog.TextSize = 14;

                btnLog.IsBold = false;



                btnLogLine.Visible = false;

                btnSensorLine.Visible = true;

@@ -185,7 +190,7 @@
                btnIcon.ButtonClickEvent += (sender, e) =>

                {

                    //菜单控件

                    var frameMenu = new TopRightMenuControl(2);

                    var frameMenu = new TopRightMenuControl(2, 2);

                    //防区列表

                    string menu1 = Language.StringByID(R.MyInternationalizationString.uGarrisonAreaList);

                    frameMenu.AddRowMenu(menu1, "Item/GarrisonList.png", "Item/GarrisonListSelected.png", () =>

@@ -423,6 +428,8 @@
                            }

                        }

                    }

                    //调整列表控件高度

                    listView.AdjustChidrenFrameHeight(listView.frameTable, Application.GetRealHeight(46));

                    //开启传感器报警监视

                    this.StartCheckDeviceAlarm();

                    //开启设备在线监测

@@ -483,7 +490,7 @@
                var control = this.dicSensorStatuView[mainkey];

                //获取传感器报警信息的翻译文本

                var msgInfo = HdlAlarmsLogic.Current.GetSensorAlarmInfo(device);

                Application.RunOnMainThread(() =>

                HdlThreadLogic.Current.RunMain(() =>

                {

                    control?.SetSensoReportInfo(msgInfo);

                });

@@ -542,7 +549,16 @@
                        //界面关闭

                        return;

                    }

                    Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                    int statu = 0;

                    var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);

                    if (statu != -1)

                    {

                        for (int i = 0; i < list.Count; i++)

                        {

                            //设置设备在线状态

                            this.ReceiveDeviceStatuPush(list[i]);

                        }

                    }

                }

            });

        }