2020-06-03-1

陈嘉乐

2020-06-03 f573c74a1b431a6d016d766628f2e6320fa42ff9

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

@@ -19,10 +19,13 @@
            UserView.HomePage.Instance.ScrollEnabled = false;
            CompleteView completeView = new CompleteView();
            flMain.AddChidren(completeView.Show(1));
            completeView.Btntitle.Text = common.DeviceEpointName;
            completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
            {
                UserView.HomePage.Instance.ScrollEnabled = true;
                if (!edit)
                {
                    UserView.HomePage.Instance.ScrollEnabled = true;
                }
                flMain.RemoveFromParent();
            };
            flMain.MouseUpEventHandler += clickcancel;
@@ -331,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]);
                            }


@@ -375,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]);

                                    };

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

                                    openView.titleBtn.TextID = MyInternationalizationString.smokescreen;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
@@ -400,7 +404,7 @@
                                }
                                break;
                            case 43:
                                {
                                {//召元说的
                                    openView.titleBtn.TextID = MyInternationalizationString.gas;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
@@ -433,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;
                                    }

                                }


                            }


@@ -489,7 +496,7 @@
                    }
                    break;
                case DeviceType.DoorLock:
                    {
                    {


                        flMain.RemoveFromParent();
                        var memberList = new MemberList();
@@ -532,7 +539,7 @@
                            Send.dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
                            Send.dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            Send.dictionary(deviceConditionsInfo, "Range", "1");//1:等于AttriButeData1时触发动作
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "50");//默认温度值50℃
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "5000");//默认温度值50℃
                            Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                        }
                        else
@@ -541,7 +548,7 @@
                            Send.dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
                            Send.dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            Send.dictionary(deviceConditionsInfo, "Range", "1");//1:等于AttriButeData1时触发动作
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "50");//默认湿度值50%
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "5000");//默认湿度值50%
                            Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                        }
                        mUIPickerView.setNPicker(mList1, mList2, mList3);
@@ -550,8 +557,10 @@

                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
                        {
                            ///温度进率转换*100
                            var strValue = (int.Parse(mList2[s2]) * 100).ToString();
                            SelectedDeviceStatus = "TemperatureSensor";
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", mList2[s2]);
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", strValue);
                            switch (mList1[s1])
                            {
                                case ">":
@@ -617,8 +626,10 @@
                                    break;
                            }
                            //查找索引
                            index1 = mList1.IndexOf(s);
                            index2 = mList2.IndexOf(devices["AttriButeData1"]);
                            index1 = mList1.IndexOf(s);

                            //转换温度值/100

                            var dd = (int.Parse(devices["AttriButeData1"])/100).ToString();
                            index2 = mList2.IndexOf(dd);

                        }
                        ///更新最新状态；
@@ -1206,7 +1217,14 @@
                    }
                    else
                    {   //添加目标
                        LogicIfon.AddDeviceactions(common, actionsInfo);
                        if (SelectedDeviceStatus == "DoorLock")
                        {//门锁数据特殊,进行特殊处理;
                            LogicIfon.AddDoorLockActions(common, actionsInfo);
                        }
                        else
                        {
                            LogicIfon.AddDeviceActions(common, actionsInfo);
                        }
                    }
                }
                else