新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -19,7 +19,7 @@
            UserView.HomePage.Instance.ScrollEnabled = false;
            CompleteView completeView = new CompleteView();
            flMain.AddChidren(completeView.Show(1));
            completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
            completeView.Btntitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
            {
                if (edit)
@@ -69,8 +69,9 @@
                ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                ProgressTextSize = 9,//显示百分比字体大小12
                SeekBarViewHeight = Application.GetRealHeight(5),//进度条的高度10
                ProgressTextSize = 12,//显示百分比字体大小12
                SeekBarViewHeight = Application.GetRealHeight(6),//进度条的高度10
                SeekBarPadding = 30,
            };
            #endregion
            #endregion
@@ -308,7 +309,7 @@
                                closeView.selectedIconBtn.Visible = true;
                            }
                            Send.dictionary(deviceConditionsInfo, "Range", "5");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//支持1和2;1+2=3
                        };
                        ///点击取消事件
                        closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -318,8 +319,8 @@
                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            openView.selectedIconBtn.Visible = false;
                            closeView.selectedIconBtn.Visible = true;
                            Send.dictionary(deviceConditionsInfo, "Range", "1");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                            Send.dictionary(deviceConditionsInfo, "Range", "8");//1
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
                            if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
                            {
                                SelectedDeviceStatus = "";
@@ -489,13 +490,13 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices.ContainsKey("IgnoreTime"))
                                if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
                                {
                                    timeValue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices["AttriButeData1"] == "1")
                                    if (devices["Range"]== "5")
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -529,7 +530,7 @@
                        Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        completeView.Show(l).AddChidren(openView.Show());
                        openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
                        openView.titleBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
                        //openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
                        openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -548,7 +549,7 @@
                    }
                    break;
                case DeviceType.DoorLock:
                    {

                    {

                        flMain.RemoveFromParent();
                        var memberList = new MemberList();
@@ -678,8 +679,8 @@
                                    break;
                            }
                            //查找索引
                            index1 = mList1.IndexOf(s);

                            //转换温度值/100

                            index1 = mList1.IndexOf(s);
                            //转换温度值/100
                            var dd = (int.Parse(devices["AttriButeData1"])/100).ToString();
                            index2 = mList2.IndexOf(dd);

@@ -1299,7 +1300,7 @@
                {
                    if (!edit)
                    {
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                        var alert = new ShowMsgControl(ShowMsgType.Normal,
                                    Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                   Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();