From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 22 六月 2022 11:22:18 +0800 Subject: [PATCH] 修改引用路径 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs | 348 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 232 insertions(+), 116 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs index 23a9f63..2ea09fb 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs @@ -46,7 +46,11 @@ /// <summary> /// PM鐩爣鍚嶅瓧 /// </summary> - private string bindPmName = string.Empty; + private string bindPMName = string.Empty; + /// <summary> + /// Co2鐩爣鍚嶅瓧 + /// </summary> + private string bindCo2Name = string.Empty; /// <summary> /// 琚粦鐩爣鏄┖璋� /// </summary> @@ -71,6 +75,10 @@ /// 琚粦鐩爣鏄疨M2.5 /// </summary> private CommonDevice bindPMDev; + /// <summary> + /// 琚粦鐩爣鏄疨M2.5 + /// </summary> + private CommonDevice bindCo2Dev; // <summary> /// 鎸夐敭涓缁戝畾鐨勭洰鏍囧垪琛� /// </summary> @@ -118,7 +126,7 @@ btnPic.Gravity = Gravity.CenterHorizontal; listBackControl.frameTable.AddChidren(btnPic); //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment) { btnPic.UnSelectedImagePath = "DeviceItem/ButtonPanelFangyueEnvironmentBigPic.png"; @@ -149,8 +157,8 @@ bodyFrameLayout.AddChidren(btnFinish); btnFinish.ButtonClickEvent += (sender, e) => { - //鍏抽棴鑷韩 - this.CloseForm(); + //鍏抽棴鑷韩 + this.CloseForm(); }; } @@ -170,6 +178,8 @@ this.AddTemperatureSensorRow(); //娣诲姞婀垮害鏉ユ簮 this.AddHumiditySourceRow(); + //娣诲姞CO2鏉ユ簮 + //this.AddCO2Row(); //鏁版嵁鐭 this.DataCorrectionRow(); //浜害璋冭妭 @@ -190,18 +200,18 @@ { Application.RunOnMainThread(() => { - CommonPage.Loading.Start(""); - }); + CommonPage.Loading.Start(""); + }); - //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + //鑾峰彇璁惧绫诲瀷鐨� + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); bool result = false; - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir) { result = await GetBindName(curControlDev); } - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEnvironment + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment) { result = await GetEnvironmentBindName(curControlDev); } @@ -223,9 +233,9 @@ { Application.RunOnMainThread(() => { - this.InitMenuRow(); - CommonPage.Loading.Hide(); - }); + this.InitMenuRow(); + CommonPage.Loading.Hide(); + }); } }); } @@ -246,69 +256,96 @@ bindList = panelBindListRes.getAllBindResponseData.BindList; foreach (var bDev in bindList) { - var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint); + var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint); if (device == null) { continue; } //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); if (device.Type == DeviceType.Thermostat) { //闈㈡澘鐨勭┖璋冭澶囷紝鍒欎笉鏄剧ず - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir) { continue; } - bindAcName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindAcDev = device; } else if (device.Type == DeviceType.FreshAir) { //闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEnvironment + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment) { continue; } - bindFreshAirName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindFreshAirDev = device; } else if (device.Type == DeviceType.TemperatureSensor) { - var bD = device as TemperatureSensor; - if (bD.SensorDiv == 1) + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor) { - bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); - bindTemperatureDev = device; + if (bDev.BindCluster == 1026) + { + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); + bindTemperatureDev = device; + } + if (bDev.BindCluster == 1029) + { + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); + bindHumidityDev = device; + } + if (bDev.BindCluster == 1066) + { + bindPMName = Common.LocalDevice.Current.GetDeviceEpointName(device); + bindPMDev = device; + } + if (bDev.BindCluster == 1037) + { + bindCo2Name = Common.LocalDevice.Current.GetDeviceEpointName(device); + bindCo2Dev = device; + } } - if (bD.SensorDiv == 2) + else { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); - bindHumidityDev = device; + var bD = device as TemperatureSensor; + if (bD.SensorDiv == 1) + { + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device); + bindTemperatureDev = device; + } + else if (bD.SensorDiv == 2) + { + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); + bindHumidityDev = device; + } } } else if (device.Type == DeviceType.FreshAirHumiditySensor) { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindHumidityDev = device; } else if (device.Type == DeviceType.PMSensor) { if (bDev.BindCluster == 1026) { - bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); bindTemperatureDev = device; } if (bDev.BindCluster == 1029) { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); bindHumidityDev = device; } if (bDev.BindCluster == 1066) { - bindPmName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindPMName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindPMDev = device; } } @@ -343,35 +380,35 @@ bindList = panelBindListRes.getAllBindResponseData.BindList; foreach (var bDev in bindList) { - var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint); + var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint); if (device == null) { continue; } //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); if (device.Type == DeviceType.Thermostat) { //闈㈡澘鐨勭┖璋冭澶囷紝鍒欎笉鏄剧ず - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEnvironment + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment) { continue; } - bindAcName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindAcDev = device; } else if (device.Type == DeviceType.FreshAir) { //闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず - if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment - || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEnvironment + || deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment) { continue; } - bindFreshAirName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindFreshAirDev = device; } else if (device.Type == DeviceType.TemperatureSensor) @@ -379,35 +416,57 @@ var bD = device as TemperatureSensor; if (bD.SensorDiv == 1) { - bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); - bindTemperatureDev = device; + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor) + { + if (bDev.BindCluster == 1026) + { + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); + bindTemperatureDev = device; + } + } + else + { + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device); + bindTemperatureDev = device; + } } if (bD.SensorDiv == 2) { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindHumidityDev = device; + } + + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor) + { + if (bDev.BindCluster == 1029) + { + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); + bindHumidityDev = device; + } } } else if (device.Type == DeviceType.FreshAirHumiditySensor) { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindHumidityDev = device; } else if (device.Type == DeviceType.Thermostat) { - bindAcName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device); bindAcDev = device; } else if (device.Type == DeviceType.PMSensor) { if (bDev.BindCluster == 1026) { - bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor); bindTemperatureDev = device; } if (bDev.BindCluster == 1029) { - bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor); bindHumidityDev = device; } } @@ -431,7 +490,7 @@ private void AddAcRow() { //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) { return; @@ -460,18 +519,19 @@ paneTargetsBaseFormp.actionAcTarget += (bindName) => { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) + Application.RunOnMainThread(() => { - btnAcStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnAcStatu.Text = bindName; - } - }); - }; + if (string.IsNullOrEmpty(bindName)) + { + btnAcStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindAcDev = null; + } + else + { + btnAcStatu.Text = bindName; + } + }); + }; }; } #endregion @@ -500,8 +560,8 @@ rowNewWind.ButtonClickEvent += (sender, e) => { - //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + //鑾峰彇璁惧绫诲瀷鐨� + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) { this.deviceObj.DeviceEpoint = 1; @@ -517,18 +577,19 @@ paneTargetsBaseFormp.Show(); paneTargetsBaseFormp.actionFreshAirTarget += (bindName) => { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) + Application.RunOnMainThread(() => { - btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnNewWindStatu.Text = bindName; - } - }); - }; + if (string.IsNullOrEmpty(bindName)) + { + btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindFreshAirDev = null; + } + else + { + btnNewWindStatu.Text = bindName; + } + }); + }; }; } #endregion @@ -540,7 +601,7 @@ private void AddPMRow() { //鑾峰彇璁惧绫诲瀷鐨� - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) { return; @@ -554,9 +615,9 @@ //鍙崇澶� rowPM.AddRightArrow(); var msg = Language.StringByID(R.MyInternationalizationString.nothing); - if (!string.IsNullOrEmpty(bindPmName)) + if (!string.IsNullOrEmpty(bindPMName)) { - msg = bindPmName; + msg = bindPMName; } var btnPMStatu = rowPM.AddMostRightView(msg, 700); rowPM.ButtonClickEvent += (sender, e) => @@ -568,18 +629,19 @@ paneTargetsBaseFormp.Show(); paneTargetsBaseFormp.actionPMTarget += (bindName) => { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) + Application.RunOnMainThread(() => { - btnPMStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnPMStatu.Text = bindName; - } - }); - }; + if (string.IsNullOrEmpty(bindName)) + { + btnPMStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindPMDev = null; + } + else + { + btnPMStatu.Text = bindName; + } + }); + }; }; } #endregion @@ -613,18 +675,19 @@ paneTargetsBaseFormp.Show(); paneTargetsBaseFormp.actionTemperatureTarget += (bindName) => { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) + Application.RunOnMainThread(() => { - btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnTemperatureStatu.Text = bindName; - } - }); - }; + if (string.IsNullOrEmpty(bindName)) + { + btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindTemperatureDev = null; + } + else + { + btnTemperatureStatu.Text = bindName; + } + }); + }; }; } #endregion @@ -658,18 +721,71 @@ paneTargetsBaseFormp.Show(); paneTargetsBaseFormp.actionHumidityTarget += (bindName) => { - Application.RunOnMainThread(() => + Application.RunOnMainThread(() => + { + if (string.IsNullOrEmpty(bindName)) + { + btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindHumidityDev = null; + } + else + { + btnHumidityStatu.Text = bindName; + } + }); + }; + }; + } + #endregion + + #region 鈻� CO2鏉ユ簮_________________________ + /// <summary> + /// CO2鏉ユ簮琛� + /// </summary> + private void AddCO2Row() + { + //鑾峰彇璁惧绫诲瀷鐨� + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj }); + if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) + { + return; + } + //CO2 + var rowCo2 = new FrameRowControl(listview.rowSpace / 2); + listview.AddChidren(rowCo2); + rowCo2.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.CO2Source), 600); + //搴曠嚎 + rowCo2.AddBottomLine(); + //鍙崇澶� + rowCo2.AddRightArrow(); + var msg = Language.StringByID(R.MyInternationalizationString.nothing); + if (!string.IsNullOrEmpty(bindCo2Name)) + { + msg = bindCo2Name; + } + var btnCo2Statu = rowCo2.AddMostRightView(msg, 700); + rowCo2.ButtonClickEvent += (sender, e) => + { + this.deviceObj.DeviceEpoint = 1; + var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindPMDev, BindInfo.BindType.CO2); + Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); + Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; + paneTargetsBaseFormp.Show(); + paneTargetsBaseFormp.actionPMTarget += (bindName) => + { + Application.RunOnMainThread(() => + { + if (string.IsNullOrEmpty(bindName)) { - if (string.IsNullOrEmpty(bindName)) - { - btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnHumidityStatu.Text = bindName; - } - }); - }; + btnCo2Statu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + bindPMDev = null; + } + else + { + btnCo2Statu.Text = bindName; + } + }); + }; }; } #endregion @@ -725,7 +841,7 @@ private void InitTopRightMenu() { //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘 - if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(deviceObj) == false) + if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(deviceObj) == false) { return; } @@ -735,8 +851,8 @@ btnIcon.InitControl(); btnIcon.ButtonClickEvent += ((sender, e) => { - //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈� - this.ShowTopRightMenu(); + //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈� + this.ShowTopRightMenu(); }); } @@ -750,8 +866,8 @@ string deviceMenu = Language.StringByID(R.MyInternationalizationString.uFixedPosition); frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () => { - //鍙戦�佸畾浣嶅姛鑳� - HdlDeviceCommonLogic.Current.SetFixedPositionCommand(deviceObj); + //鍙戦�佸畾浣嶅姛鑳� + Common.LocalDevice.Current.SetFixedPositionCommand(deviceObj); }); } -- Gitblit v1.8.0