2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，...

JLChen

2020-03-10 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5

 Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs

@@ -94,7 +94,7 @@
                        continue;
                    }
                    foreach (var light in room.DeviceList) {
                        if (light.Type == DeviceType.LightSwitchSocket) {
                        if (light.Type == DeviceType.LightEnergySocket) {
                            if ((light as LightSwitch).CurrentBrightness == 100)
                                brighingCount++;
                        }
@@ -149,7 +149,7 @@
                                if (roomRow.Tag.ToString () == room.Name) {
                                    int oCount = 0;
                                    foreach (var light in room.DeviceList) {
                                        if (light.Type == DeviceType.LightSwitchSocket) {
                                        if (light.Type == DeviceType.LightEnergySocket) {
                                            if ((light as LightSwitch).CurrentBrightness == 100)
                                                oCount++;
                                        }
@@ -207,7 +207,7 @@
                        foreach (var common in room.DeviceList) {
                            //controlDeviceIndex++;
                            byte [] returnBytes = null;
                            if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
                            if (common.Type == DeviceType.LightEnergySocket) {
                                returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
                                if (showTip) {
                                    if (returnBytes == null) {
@@ -273,7 +273,7 @@
                        foreach (var common in room.DeviceList) {
                            //controlDeviceIndex++;
                            byte [] returnBytes = null;
                            if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
                            if (common.Type == DeviceType.LightEnergySocket) {
                                new System.Threading.Thread (() => {
                                    mSendCount++;
                                    returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
@@ -414,7 +414,7 @@
                    continue;
                }
                foreach (var common in room.DeviceList) {
                    if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
                    if (common.Type == DeviceType.LightEnergySocket) {
                        LightCount++;
                        var light = common as LightSwitch;
                        var lightView = new FrameLayout () {
@@ -504,7 +504,7 @@
                    foreach (var c in EnergtLightList) {
                        Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
                        Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
                        System.Threading.Thread.Sleep (500);
                        System.Threading.Thread.Sleep (200);
                    }
                    Thread.Sleep (10000);
                }
@@ -569,7 +569,7 @@
                        continue;
                    }
                    var list = room.DeviceList.FindAll ((obj) => {
                        return obj.Type == DeviceType.LightSwitchSocket;
                        return obj.Type == DeviceType.LightEnergySocket;
                    });
                    foreach (Common common in list) {
                        common.LastUpdateTime = DateTime.MinValue;
@@ -588,7 +588,7 @@
                            continue;
                        }
                        var list = room.DeviceList.FindAll ((obj) => {
                            return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightSwitchSocket;
                            return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightEnergySocket;
                        });
                        foreach (Common common in list) {
                            var s = common.Type + "_" + common.SubnetID + "_" + common.DeviceID;
@@ -597,7 +597,8 @@
                                continue;
                            }
                            readList.Add (s);
                            Control.ControlBytesSendHasReturn (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
                            Control.ControlBytesSend (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
                            Thread.Sleep (200);
                        }
                    }
                    IsReadingAll = false;