上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -312,11 +312,7 @@
                                            {
                                                case 13:
                                                    {
                                                        if (intvalue == "1")
                                                        {
                                                            state=Language.StringByID( MyInternationalizationString.someone);
                                                        }
                                                        else
                                                        if (conditions.ContainsKey("IgnoreTime"))
                                                        {
                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -340,48 +336,55 @@

                                                            }
                                                        }
                                                        else
                                                        {
                                                            state = Language.StringByID(MyInternationalizationString.someone);
                                                        }

                                                    }
                                                    break;
                                                case 21:
                                                case 22:
                                                    {
                                                        if (intvalue == "1")
                                                        if (conditions.ContainsKey("IgnoreTime"))
                                                        {
                                                            state =Language.StringByID( MyInternationalizationString.logicopen);
                                                        }
                                                        else
                                                        {
                                                            if (conditions.ContainsKey("IgnoreTime"))

                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
                                                            if (minute != 0 && second != 0)
                                                            {

                                                                int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                                int second = int.Parse(conditions["IgnoreTime"]) % 60;
                                                                if (minute != 0 && second != 0)
                                                                {
                                                                    state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

                                                                }
                                                                else
                                                                {
                                                                    if (minute == 0 && second != 0)
                                                                    {
                                                                        state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

                                                                    }
                                                                    if (minute != 0 && second == 0)
                                                                    {
                                                                        state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);

                                                                    }

                                                                }
                                                                state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

                                                            }
                                                            else
                                                            {
                                                                state =Language.StringByID(MyInternationalizationString.logicclose);
                                                                if (minute == 0 && second != 0)
                                                                {
                                                                    state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

                                                                }
                                                                if (minute != 0 && second == 0)
                                                                {
                                                                    state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);

                                                                }

                                                            }

                                                        }
                                                        else
                                                        {
                                                            if (intvalue == "1")
                                                            {
                                                                state = Language.StringByID(MyInternationalizationString.logicopen);
                                                            }
                                                            else
                                                            {
                                                                state = Language.StringByID(MyInternationalizationString.logicclose);
                                                            }

                                                        }

                                                    }
                                                    break;
                                                case 40:
@@ -563,11 +566,11 @@
                                    {
                                        if (conditions["AtHome"] == "1")
                                        {
                                            state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + "米";
                                            state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
                                        }
                                        else
                                        {
                                            state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + "米";
                                            state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
                                        }
                                    }
                                }