2020-06-01-1

陈嘉乐

2020-06-01 117cf59a3a1ed52481eab58aac9dbe14e82e50a7

2020-06-01-1

修改传感器显示文本不正确的问题

 .DS_Store

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,31 +1,30 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="428" Column="50" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="334" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/IgnoreTime.cs" Line="143" Column="18" />
      <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="230" Column="57" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="448" Column="55" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1260" Column="49" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="734" Column="34" />
      <File FileName="Shared/Phone/Device/Logic/IgnoreTime.cs" Line="147" Column="22" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="196" Column="29" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="CurrentDeviceState.cs" selected="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Logic" expanded="True" />
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -551,6 +551,7 @@
5402=时效性常开将要
5403=分关闭
5404=时
5405=米

10000=HDL Home
10001=常用

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

old mode 100755
new mode 100644
@@ -334,7 +334,7 @@
                                var ignoreTime = new IgnoreTime();
                                UserView.HomePage.Instance.AddChidren(ignoreTime);
                                UserView.HomePage.Instance.PageIndex += 1;
                                ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue);
                                ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue, _if[1]);
                            }


@@ -378,7 +378,7 @@
                                        var ignoreTime = new IgnoreTime();
                                        UserView.HomePage.Instance.AddChidren(ignoreTime);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue);
                                        ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue, _if[1]);

                                    };

@@ -387,7 +387,7 @@
                                break;
                            case 40:
                                {
                                    

                                    openView.titleBtn.TextID = MyInternationalizationString.smokescreen;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
@@ -437,27 +437,30 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices["AttriButeData1"] == "1")
                                if (devices.ContainsKey("IgnoreTime"))
                                {
                                    openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    openView.selectedIconBtn.Visible = true;
                                    closeView.selectedIconBtn.Visible = false;
                                    timevalue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices.ContainsKey("IgnoreTime"))
                                    if (devices["AttriButeData1"] == "1")
                                    {
                                        timevalue = int.Parse(devices["IgnoreTime"]);
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                        openView.selectedIconBtn.Visible = true;
                                        closeView.selectedIconBtn.Visible = false;
                                    }
                                    else
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        openView.selectedIconBtn.Visible = false;
                                        closeView.titleBtn.Visible = true;
                                        closeView.selectedIconBtn.Visible = true;
                                    }

                                }


                            }



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

@@ -16,7 +16,7 @@

        }
        Button selectedIcon = new Button();
        public void Show(CommonDevice common, string name, bool edit, int timevalue)
        public void Show(CommonDevice common, string name, bool edit, int timevalue,string _if)
        {

            #region  上面的布局代码
@@ -107,7 +107,7 @@
                        PickerView.ShowNormal(minuteList, secondList, null, (Index1, Index2, Index3) =>
                          {
                              selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
                              TimeMethod(common, selectetimedvalue, timevalue, edit);
                              TimeMethod(common, selectetimedvalue, timevalue, edit, _if);
                          }, selectIndex1, selectIndex2, 0, Language.StringByID(MyInternationalizationString.logiccustom));
                    }
                    else
@@ -120,11 +120,11 @@

            saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                TimeMethod(common, selectetimedvalue, timevalue, edit);
                TimeMethod(common, selectetimedvalue, timevalue, edit,_if);
            };
        }

        public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit)
        public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit,string  _if)
        {

            var deviceConditionsInfo = new Dictionary<string, string>();
@@ -163,10 +163,35 @@
                }

            }
            var logicCommunalPage = new LogicCommunalPage();
            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
            UserView.HomePage.Instance.PageIndex += 1;
            logicCommunalPage.Show(() => { });

            switch (_if)
            {
                case "logic":
                    {
                        //自动化
                        var logicCommunalPage = new LogicCommunalPage();
                        UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        logicCommunalPage.Show(() => { });
                    }
                    break;
                case "mould":
                    {
                        //自动化推荐模板
                        var templatePage = new TemplatePage();
                        UserView.HomePage.Instance.AddChidren(templatePage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        templatePage.Show();
                    }
                    break;

            }


            //var logicCommunalPage = new LogicCommunalPage();
            //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
            //UserView.HomePage.Instance.PageIndex += 1;
            //logicCommunalPage.Show(() => { });

        }
    }

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

old mode 100755
new mode 100644
@@ -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);
                                        }
                                    }
                                }

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

@@ -221,23 +221,23 @@
                catch { }
            };

            //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
            //{
            //    var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
            //    if (DoorlockKey == key)
            //    {
            //        try
            //        {
            //            Application.RunOnMainThread(() =>
            //            {
            //                Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
            //                ModeView();
            //            });
            //        }
            //        catch { }
            //    }
            //};
        }
            //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
            //{
            //    var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
            //    if (DoorlockKey == key)
            //    {
            //        try
            //        {
            //            Application.RunOnMainThread(() =>
            //            {
            //                Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
            //                ModeView();
            //            });
            //        }
            //        catch { }
            //    }
            //};
        }
        /// <summary>
        /// 常开模式开关切换图标界面
        /// </summary>

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

old mode 100755
new mode 100644
@@ -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;
                                            }

 ZigbeeApp/Shared/R.cs

old mode 100755
new mode 100644
@@ -882,6 +882,7 @@
        public readonly static int timeSensitive = 5402;
        public readonly static int executeSone = 5403;
        public readonly static int hour1 = 5404;
        public readonly static int mi = 5405;