2020-12-30-1

陈嘉乐

2020-12-30 81307af66465a6b5ba189b0fb9b347787f004a4e

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

old mode 100644
new mode 100755
@@ -490,13 +490,13 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices.ContainsKey("IgnoreTime"))
                                if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
                                {
                                    timeValue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices["AttriButeData1"] == "1")
                                    if (devices["Range"]== "5")
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -549,7 +549,7 @@
                    }
                    break;
                case DeviceType.DoorLock:
                    {

                    {

                        flMain.RemoveFromParent();
                        var memberList = new MemberList();
@@ -679,8 +679,8 @@
                                    break;
                            }
                            //查找索引
                            index1 = mList1.IndexOf(s);

                            //转换温度值/100

                            index1 = mList1.IndexOf(s);
                            //转换温度值/100
                            var dd = (int.Parse(devices["AttriButeData1"])/100).ToString();
                            index2 = mList2.IndexOf(dd);

@@ -1300,7 +1300,7 @@
                {
                    if (!edit)
                    {
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                    Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                   Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();