1

wxr

2023-03-31 d53e6af2c5f17838fa79659614b15a2a1f383399

 Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs

@@ -181,87 +181,8 @@
            deviceScrolView.RemoveAll ();
            System.Threading.Tasks.Task.Run (() => {
                //找出需要显示的设备
                var filesList = IO.FileUtils.ReadFiles ().FindAll ((obj) => {
                    string [] str = obj.Split ('_');
                    return obj.StartsWith ("Equipment_") && str.Length == 5;
                });
                var localEquipments = filesList.FindAll ((obj) => {
                    string typeString = obj.Split ('_') [1];
                    return (
                    #region light
                    typeString.ToString () == DeviceType.LightCCT.ToString () ||
                    typeString.ToString () == DeviceType.LightRGB.ToString () ||
                    typeString.ToString () == DeviceType.LightDALI.ToString () ||
                    typeString.ToString () == DeviceType.LightRGBW.ToString () ||
                    typeString.ToString () == DeviceType.LightLogic.ToString () ||
                    typeString.ToString () == DeviceType.LightSwitch.ToString () ||
                    typeString.ToString () == DeviceType.LightDimming.ToString () ||
                    typeString.ToString () == DeviceType.LightMixSwitch.ToString () ||
                    typeString.ToString () == DeviceType.LightRGBandCCT.ToString () ||
                    typeString.ToString () == DeviceType.LightMixDimming.ToString () ||
                    typeString.ToString () == DeviceType.LightEnergySwitch.ToString () ||
                    typeString.ToString () == DeviceType.LightEnergySocket.ToString () || 
                    typeString.ToString () == DeviceType.LightSwitchSocket.ToString ()
                    || typeString.ToString () == DeviceType.DMX48.ToString ()
                    #endregion
                    #region light
                    || typeString.ToString () == DeviceType.SensorCH4.ToString () ||
                    typeString.ToString () == DeviceType.SensorCO2.ToString () ||
                    typeString.ToString () == DeviceType.SensorLPG.ToString () ||
                    typeString.ToString () == DeviceType.SensorCOH2.ToString () ||
                    typeString.ToString () == DeviceType.SensorPM25.ToString () ||
                    typeString.ToString () == DeviceType.SensorTVOC.ToString () ||
                    typeString.ToString () == DeviceType.SensorPower.ToString () ||
                    typeString.ToString () == DeviceType.SensorSmoke.ToString () ||
                    typeString.ToString () == DeviceType.SensorWater.ToString () ||
                    typeString.ToString () == DeviceType.SensorWeight.ToString () ||
                    typeString.ToString () == DeviceType.SensorCurrent.ToString () ||
                    typeString.ToString () == DeviceType.SensorVoltage.ToString ()
                    || typeString.ToString () == DeviceType.SensorRainfall.ToString ()
                    || typeString.ToString () == DeviceType.SensorVelocity.ToString ()
                    || typeString.ToString () == DeviceType.SensorMenciAndwindowMagnetic.ToString ()
                    || typeString.ToString () == DeviceType.SensorMobileDetection.ToString ()
                    || typeString.ToString () == DeviceType.SensorLiquidPressure.ToString ()
                    || typeString.ToString () == DeviceType.SensorVibration.ToString ()
                    || typeString.ToString () == DeviceType.SensorLiquidFlow.ToString ()
                    || typeString.ToString () == DeviceType.SensorLiquidDepth.ToString ()
                    || typeString.ToString () == DeviceType.SensorTemperature.ToString ()
                    || typeString.ToString () == DeviceType.SensorHeightLength.ToString ()
                    || typeString.ToString () == DeviceType.SensorIllumination.ToString ()
                    || typeString.ToString () == DeviceType.SensorWindPressure.ToString ()
                    || typeString.ToString () == DeviceType.SensorHumidity.ToString ()
                    #endregion
                    #region curtain
                    || typeString.ToString () == DeviceType.CurtainModel.ToString ()
                    || typeString.ToString () == DeviceType.CurtainRoller.ToString ()
                    || typeString.ToString () == DeviceType.CurtainTrietex.ToString ()
                    #endregion
                    #region ac
                    || typeString.ToString () == DeviceType.ACPanel.ToString ()
                    || typeString.ToString () == DeviceType.ACDevice.ToString ()
                    || typeString.ToString () == DeviceType.ACInfrared.ToString ()
                    || typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
                    || typeString.ToString () == DeviceType.CustomAC.ToString ()
                    || typeString.ToString () == DeviceType.HVAC.ToString ()
                    #endregion
                    #region foolheat
                    || typeString.ToString () == DeviceType.FoolHeat.ToString ()
                    || typeString.ToString () == DeviceType.FoolHeatPanel.ToString ()
                    #endregion
                    #region 
                    || typeString.ToString () == DeviceType.InfraredMode.ToString ()
                    || typeString.ToString () == DeviceType.DoorLock.ToString ()
                    || typeString.ToString () == DeviceType.FanModule.ToString ()
                    || typeString.ToString () == DeviceType.FreshAir.ToString ()
                    || typeString.ToString () == DeviceType.InfraredTV.ToString ()
                    || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
                    || typeString.ToString () == DeviceType.MusicModel.ToString ()
                    || typeString.ToString () == DeviceType.SecurityModule.ToString ()
                    || typeString.ToString () == DeviceType.LogicModule.ToString ()
                    || typeString.ToString () == DeviceType.SecurityPanel.ToString ()
                    #endregion
                    );
                });
                var localEquipments = CommonUtlis.Current.GetAllLocalEquipments ();

                var globalSceneFileList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (Scene.GlobalSceneFilePath)));
                if (globalSceneFileList == null) {
                    globalSceneFileList = new List<string> ();
@@ -443,7 +364,7 @@
                            deviceRow.AddChidren (btnEdit);
                            btnEdit.MouseUpEventHandler += (sd, ds) => {
                                Dialog dialog = new Dialog ();

                                //修改设备备注
                                var dialogView = new FrameLayout () {
                                    Gravity = Gravity.Center,
                                    Width = Application.GetRealWidth (500),
@@ -521,6 +442,21 @@
                                        return;
                                    }

                                    //修改云端备注
                                    var cloudDataLoop = CommonConfig.Current.FunctionList.Find ((obj) => obj.bus.SubnetID == commonDevice.SubnetID
                                     && obj.bus.DeviceID == commonDevice.DeviceID && obj.bus.LoopId == commonDevice.LoopID);
                                    if (cloudDataLoop == null) {
                                        new Alert (Language.StringByID (R.MyInternationalizationString.Tip), "Data is not synchronized to the cloud.", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                                    } else {
                                        new System.Threading.Thread (() => {
                                            var http = new HttpServerRequest ();
                                            var pack = http.EditDeviceName (cloudDataLoop.deviceId, UserConfig.Instance.CurrentRegion.Id, remakeStr);
                                            if (pack.Code != "0") {
                                                new Alert (Language.StringByID (R.MyInternationalizationString.Tip), $"Cloud data modification failed({pack.Code}).", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                                            }
                                        }) { IsBackground = true }.Start ();
                                    }

                                    MainPage.Loading.Start ();
                                    //byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ());
                                    System.Threading.Tasks.Task.Run (() => {