1

wxr

2023-03-31 d53e6af2c5f17838fa79659614b15a2a1f383399

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

@@ -247,28 +247,7 @@
            base.RemoveFromParent ();
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="stateCodeStr"></param>
        void ShowGetHomePagerErrorInfo (string stateCodeStr)
        {
            string mes = "";
            //2020-01-06 待补充
            if (stateCodeStr == ErrorCode.NetworkError) {
                mes = ErrorCode.NetworkError;
            } else {
                mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;

            }
            if (!string.IsNullOrEmpty (mes)) {
                Application.RunOnMainThread (() => {
                    new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                });
            }


        }
      

        public void InitRoomView (string RoomFilePath)
        {
@@ -1117,6 +1096,8 @@
                    fhRowView.AddChidren (btnFHNull);
                    #endregion
                }
                //InitRoomView (roomFilePath);

                foreach (var devcieCommon in room.DeviceList) {
                    if (devcieCommon == null)
                        continue;
@@ -1211,7 +1192,18 @@
                                //}
                                //Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID, new byte [] { fanModule.LoopID, fanModule.Switch });

                                int mSetSwitch = tempSwitch.IsSelected ? 0 : fanModule.WindSpeed;
                                int mSetSwitch = 0;
                                if (!tempSwitch.IsSelected) {
                                    //2021-03-02 修复开0档问题
                                    if (fanModule.WindSpeed == 0) {
                                        mSetSwitch = 1;
                                    } else {
                                        mSetSwitch = fanModule.WindSpeed;
                                    }
                                } else {
                                    mSetSwitch = 0;
                                }

                                SendControl.SendControlSetSingleLight (fanModule, new byte [] { fanModule.LoopID, (byte)mSetSwitch });
                                //IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());
                            };
@@ -2411,6 +2403,7 @@
                //if (!roomDeviceFilePathList.Contains (filePath)) {
                //    roomDeviceFilePathList.Add (filePath);
                //}

            };
            GenericDialog.Current.ShowModifyRemarksDialog (commonDevice, commonBytes, btnEquipment, successAction);
        }