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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -348,7 +348,7 @@
            //右箭头

            rowDevice.frameTable.AddRightArrow();

            //在线状态

            rowDevice.isOnline = device.IsOnline == 1;

            rowDevice.isOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);



            //保存控件

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

@@ -792,7 +792,7 @@
            {

                if (rowInfo != null)

                {

                    rowInfo.MenuRow.isOnline = device.IsOnline == 1;

                    rowInfo.MenuRow.isOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);

                    if (rowInfo.dicDetailRow != null)

                    {

                        foreach (var detailRow in rowInfo.dicDetailRow.Values)