Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

陈嘉乐

2021-03-16 e1ac4ab0e68024e6289e0b11756962d662749b04

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs

@@ -170,6 +170,7 @@
            btnVoiceIcon.X = btnChargeIcon.Right + Application.GetRealWidth(50);

            btnVoiceIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/Voice.png";

            btnVoiceIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/VoiceSelect.png";

            btnVoiceIcon.IsSelected = true;

            FrameWhiteCentet1.AddChidren(btnVoiceIcon);

            btnVoiceIcon.ButtonClickEvent += (sender, e) =>

            {

@@ -280,7 +281,7 @@


            //吸力1档

            var iconPath = this.weepRobotData.Suction == "quiet" ? "FunctionIcon/Electrical/WeepRobot/SuctionSelect.png" : "FunctionIcon/Electrical/WeepRobot/Suction.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.SuctionOneGear), iconPath, this.weepRobotData.Suction == "strong", () =>

            menuContr.AddRowMenu(Language.StringByID(StringId.SuctionOneGear), iconPath, this.weepRobotData.Suction == "quiet", () =>

            {

                frameBack.Close();

                //发送吸力命令

@@ -298,7 +299,7 @@


            //吸力3档

            iconPath = this.weepRobotData.Suction == "strong" ? "FunctionIcon/Electrical/WeepRobot/SuctionSelect.png" : "FunctionIcon/Electrical/WeepRobot/Suction.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.SuctionThreeGear), iconPath, this.weepRobotData.Suction == "quiet", () =>

            menuContr.AddRowMenu(Language.StringByID(StringId.SuctionThreeGear), iconPath, this.weepRobotData.Suction == "strong", () =>

            {

                frameBack.Close();

                //发送吸力命令

@@ -335,26 +336,26 @@
            dialogBody.AddChidren(menuContr);



            //自动清扫

            var iconPath = this.weepRobotData.Mode == "random" ? "FunctionIcon/Electrical/WeepRobot/AutoModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AutoMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AutoClean), iconPath, this.weepRobotData.Mode == "random", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "random");

            });



            //定点清扫

            iconPath = this.weepRobotData.Mode == "smart" ? "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.FixedPointClean), iconPath, this.weepRobotData.Mode == "smart", () =>

            var iconPath = this.weepRobotData.Mode == "smart" ? "FunctionIcon/Electrical/WeepRobot/AutoModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AutoMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AutoClean), iconPath, this.weepRobotData.Mode == "smart", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "smart");

            });



            //区域清扫

            //随机清扫

            iconPath = this.weepRobotData.Mode == "random" ? "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.RandomClean), iconPath, this.weepRobotData.Mode == "random", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "random");

            });



            //螺旋清扫

            iconPath = this.weepRobotData.Mode == "spiral" ? "FunctionIcon/Electrical/WeepRobot/AreaModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AreaMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AreaClean), iconPath, this.weepRobotData.Mode == "spiral", () =>

            menuContr.AddRowMenu(Language.StringByID(StringId.SpiralClean), iconPath, this.weepRobotData.Mode == "spiral", () =>

            {

                frameBack.Close();

                //发送模式命令

@@ -476,12 +477,12 @@
            //如果是清扫状态

            if (this.weepRobotData.Cleaning == true)

            {

                //吸力调节不可用

                this.btnSuctionIcon.IsSelected = false;

                this.btnSuctionIcon.CanClick = false;

                //吸力调节可用

                this.btnSuctionIcon.IsSelected = true;

                this.btnSuctionIcon.CanClick = true;

                //声音不可用

                this.btnVoiceIcon.IsSelected = false;

                this.btnVoiceIcon.CanClick = false;

                //this.btnVoiceIcon.IsSelected = false;

                //this.btnVoiceIcon.CanClick = false;

                //清扫模式不可用

                this.btnModeIcon.IsSelected = false;

                this.btnModeIcon.CanClick = false;

@@ -494,12 +495,12 @@
            }

            else

            {

                //吸力调节可用

                this.btnSuctionIcon.IsSelected = true;

                this.btnSuctionIcon.CanClick = true;

                //吸力调节不可用

                this.btnSuctionIcon.IsSelected = false;

                this.btnSuctionIcon.CanClick = false;

                //声音可用

                this.btnVoiceIcon.IsSelected = true;

                this.btnVoiceIcon.CanClick = true;

                //this.btnVoiceIcon.IsSelected = true;

                //this.btnVoiceIcon.CanClick = true;

                //清扫模式可用

                this.btnModeIcon.IsSelected = true;

                this.btnModeIcon.CanClick = true;

@@ -521,10 +522,10 @@
            }

            else if (this.weepRobotData.Mode == "smart")

            {

                //定点清扫

                //随机清扫

                this.btnModeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

                this.btnModeIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png";

                this.btnModeView.TextID = StringId.FixedPointClean;

                this.btnModeView.TextID = StringId.RandomClean;

            }

            else if (this.weepRobotData.Mode == "wall_follow")

            {

@@ -535,10 +536,10 @@
            }

            else if (this.weepRobotData.Mode == "spiral")

            {

                //区域清扫

                //螺旋清扫

                this.btnModeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/AreaMode.png";

                this.btnModeIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/AreaModeSelect.png";

                this.btnModeView.TextID = StringId.AreaClean;

                this.btnModeView.TextID = StringId.SpiralClean;

            }

            else

            {

@@ -560,41 +561,42 @@
        /// </summary>

        private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)

        {

            foreach (var data in i_LocalDevice.status)

            for (int i = 0; i < i_LocalDevice.attributes.Count; i++)

            {

                var data = i_LocalDevice.attributes[i];

                //开关

                if (data.key == "on_off") { this.weepRobotData.Cleaning = data.value.ToLower() == "on"; }

                if (data.key == "on_off") { this.weepRobotData.Cleaning = data.state.ToLower() == "on"; }

                //寻找机器

                else if (data.key == "seek") { this.weepRobotData.SearchRobot = data.value.ToLower() == "true"; }

                else if (data.key == "seek") { this.weepRobotData.SearchRobot = data.state.ToLower() == "true"; }

                //边刷重置

                else if (data.key == "reset_edge_brush") { this.weepRobotData.ResetEdgeBrush = data.value.ToLower() == "true"; }

                else if (data.key == "reset_edge_brush") { this.weepRobotData.ResetEdgeBrush = data.state.ToLower() == "true"; }

                //滚刷重置

                else if (data.key == "reset_roll_brush") { this.weepRobotData.ResetRollBrush = data.value.ToLower() == "true"; }

                else if (data.key == "reset_roll_brush") { this.weepRobotData.ResetRollBrush = data.state.ToLower() == "true"; }

                //滤网重置

                else if (data.key == "reset_filter") { this.weepRobotData.ResetFilter = data.value.ToLower() == "true"; }

                else if (data.key == "reset_filter") { this.weepRobotData.ResetFilter = data.state.ToLower() == "true"; }

                //吸力选择

                else if (data.key == "suction") { this.weepRobotData.Suction = data.value; }

                else if (data.key == "suction") { this.weepRobotData.Suction = data.state; }

                //工作模式

                else if (data.key == "mode") { this.weepRobotData.Mode = data.value; }

                else if (data.key == "mode") { this.weepRobotData.Mode = data.state; }

                //清扫方向   

                else if (data.key == "direction_control") { this.weepRobotData.DirectionControl = data.value; }

                else if (data.key == "direction_control") { this.weepRobotData.DirectionControl = data.state; }

                //声音开关

                else if (data.key == "voice_switch") { this.weepRobotData.VoiceSwitch = data.value.ToLower() == "true"; }

                else if (data.key == "voice_switch") { this.weepRobotData.VoiceSwitch = data.state.ToLower() == "true"; }

                //清扫面积

                else if (data.key == "clean_area")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.CleanArea = Convert.ToInt32(value);

                    }

                }

                //清扫记录   

                else if (data.key == "clean_record") { this.weepRobotData.CleanRecord = data.value; }

                else if (data.key == "clean_record") { this.weepRobotData.CleanRecord = data.state; }

                //边刷寿命

                else if (data.key == "edge_brush")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.EdgeBrush = Convert.ToInt32(value);

@@ -603,7 +605,7 @@
                //滚刷寿命

                else if (data.key == "roll_brush")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.RollBrush = Convert.ToInt32(value);

@@ -612,7 +614,7 @@
                //滤网寿命

                else if (data.key == "filter")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.Filter = Convert.ToInt32(value);

@@ -621,7 +623,7 @@
                //清扫时间

                else if (data.key == "clean_time")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.CleanTime = Convert.ToInt32(value);

@@ -630,7 +632,7 @@
                //剩余电量   

                else if (data.key == "electricity_left")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.weepRobotData.ElectricityLeft = Convert.ToInt32(value);

@@ -651,7 +653,7 @@
            /// <summary>

            /// 是否处于清扫中

            /// </summary>

            public bool Cleaning = true;

            public bool Cleaning = false;

            /// <summary>

            /// 寻找机器

            /// </summary>

@@ -673,7 +675,7 @@
            /// </summary>

            public string Suction = string.Empty;

            /// <summary>

            /// 工作模式(random:自动清扫 smart:定点清扫 wall_follow:沿墙清扫 spiral:区域清扫 chargego:充电)

            /// 工作模式(smart:自动清扫 random:随机清扫 wall_follow:沿墙清扫 spiral:螺旋清扫 chargego:充电)

            /// </summary>

            public string Mode = string.Empty;

            /// <summary>

@@ -705,7 +707,7 @@
            /// </summary>

            public int Filter = 0;

            /// <summary>

            /// 清扫时间(0-432000)

            /// 清扫时间(0-432000) 单位为分钟

            /// </summary>

            public int CleanTime = 0;

            /// <summary>