2019-12-09-2

WJC

2019-12-09 8c52c7c268ca5b2147b5276da0e2d550876213c3

2019-12-09-2

修改一些文字表达，请合并代码。

 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -603,7 +603,10 @@
5366=联动事件
5367=当前
5368=选择楼层

5369=请选择延时时间，否则无法执行下一步.
5370=请选择用户，否则无法执行下一步.
5371=请选择场景，否则无法执行下一步.
5372=请选择安防模式，否则无法执行下一步.




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

@@ -153,8 +153,8 @@
                if (clickTag == "no" || tempScene == null)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                              Language.StringByID(MyInternationalizationString.complete));
                                              Language.StringByID(MyInternationalizationString.scenetip),
                                              Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }

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

@@ -433,7 +433,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                                     Language.StringByID(MyInternationalizationString.selectweek),
                                                 Language.StringByID(MyInternationalizationString.complete));
                                                 Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();
                    return;

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

@@ -229,8 +229,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;
                    }

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

@@ -1537,7 +1537,7 @@
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -433,8 +433,8 @@
                    if (conditionsIndex == -1)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.usertip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -2079,7 +2079,7 @@
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs

@@ -151,8 +151,8 @@
                if (clickTag == "no" || tempScene == null)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                              Language.StringByID(MyInternationalizationString.complete));
                                              Language.StringByID(MyInternationalizationString.scenetip),
                                              Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }

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

@@ -203,7 +203,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                                     Language.StringByID(MyInternationalizationString.selectweek),
                                                 Language.StringByID(MyInternationalizationString.complete));
                                                 Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();
                    return;

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

@@ -160,8 +160,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 +247,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;
                }

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

@@ -617,14 +617,24 @@
                                                        {
                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
                                                            if (second != 0)
                                                            if (minute != 0 && second != 0)
                                                            {
                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

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

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

                                                                }

                                                            }
                                                        }
                                                    }
@@ -643,14 +653,24 @@

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

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

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

                                                                    }

                                                                }

                                                            }

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

@@ -2075,7 +2075,7 @@
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

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

@@ -391,6 +391,10 @@
            {
                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.securitytip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }


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

@@ -1119,7 +1119,7 @@
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

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

@@ -158,8 +158,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]);
@@ -235,8 +245,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;
                }

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

@@ -441,14 +441,24 @@
                                                        {
                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
                                                            if (second != 0)
                                                            if (minute != 0 && second != 0)
                                                            {
                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

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

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

                                                                }

                                                            }
                                                        }
                                                    }

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

@@ -485,7 +485,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                           Language.StringByID(MyInternationalizationString.completeNext),
                                          Language.StringByID(MyInternationalizationString.complete));
                                          Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }
@@ -493,7 +493,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                          Language.StringByID(MyInternationalizationString.sametime),
                                         Language.StringByID(MyInternationalizationString.complete));
                                         Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }

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

@@ -283,7 +283,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                                      Language.StringByID(MyInternationalizationString.selectweek),
                                                  Language.StringByID(MyInternationalizationString.complete));
                                                  Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();
                    return;

 ZigbeeApp/Shared/R.cs

old mode 100755
new mode 100644
@@ -573,7 +573,10 @@
        public readonly static int linkageevent = 5366;
        public readonly static int current = 5367;
        public readonly static int selecfoolr = 5368;

        public readonly static int delaytip = 5369;
        public readonly static int usertip = 5370;
        public readonly static int scenetip = 5371;
        public readonly static int securitytip = 5372;

        #region 登录注册
        /// <summary>