上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -229,11 +229,8 @@
                                            {
                                                case 13:
                                                    {
                                                        if (intvalue == "1")
                                                        {
                                                            selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
                                                        }
                                                        else

                                                        if (conditions.ContainsKey("IgnoreTime"))
                                                        {
                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -257,6 +254,11 @@

                                                            }
                                                        }
                                                        else
                                                        {
                                                            selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
                                                        }

                                                    }
                                                    break;
                                            }