完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

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

@@ -529,7 +529,6 @@
                                deviceedit.MouseUpEventHandler += (sender, e) =>
                                {


                                    if (deviceinof.Type != DeviceType.DoorLock)
                                    {
                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -734,6 +733,25 @@
                                            }
                                        }
                                        break;
                                    case DeviceType.TemperatureSensor:
                                       // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                        var dev = deviceinof as TemperatureSensor;
                                        if (conditions["Cluster_ID"]=="1026") {
                                            dev.SensorDiv = 1;
                                        } else {
                                            dev.SensorDiv = 2;
                                        }
                                        if (conditions["Cluster_ID"] == "1026")
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                            devicestatus.Text = ">" + conditions["AttriButeData1"] + "℃";
                                        }
                                        else
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
                                            devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
                                        }
                                        break;

                                }