合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

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

@@ -38,6 +38,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                Text = name,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -160,8 +161,18 @@
                            }

                        }
                        int selectIndex1 = timevalue / 60;
                        int selectIndex2 = timevalue % 60;
                        int selectIndex1 = 0;
                        int selectIndex2 = 0;
                        if (timevalue > 3600)
                        {
                            selectIndex1 = 60;
                            selectIndex2 = timevalue - 3600;
                        }
                        else
                        {
                            selectIndex1 = timevalue / 60;
                            selectIndex2 = timevalue % 60;
                        }
                        PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
                          {
                              selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
@@ -237,8 +248,8 @@
                if (!edit)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                           Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                           Language.StringByID(MyInternationalizationString.complete));
                                           Language.StringByID(MyInternationalizationString.delaytip),
                                           Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }