Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-09 134811c790a982d505567e2ba69b5de566410367

Merge branch 'dev-tzy' into temp-wxr

 HDL-ON_Android/Assets/Phone/PirIcon/Infraredtreasure.png

 HDL-ON_Android/Assets/Phone/PirIcon/STB.png

 HDL-ON_Android/Assets/Phone/PirIcon/adddevice.png

 HDL-ON_Android/Assets/Phone/PirIcon/addlbuton.png

 HDL-ON_Android/Assets/Phone/PirIcon/air.png

 HDL-ON_Android/Assets/Phone/PirIcon/custom.png

 HDL-ON_Android/Assets/Phone/PirIcon/del.png

 HDL-ON_Android/Assets/Phone/PirIcon/delbuton.png

 HDL-ON_Android/Assets/Phone/PirIcon/dropdown.png

 HDL-ON_Android/Assets/Phone/PirIcon/dvd.png

 HDL-ON_Android/Assets/Phone/PirIcon/failed.png

 HDL-ON_Android/Assets/Phone/PirIcon/fan.png

 HDL-ON_Android/Assets/Phone/PirIcon/icon1.png

 HDL-ON_Android/Assets/Phone/PirIcon/icon2.png

 HDL-ON_Android/Assets/Phone/PirIcon/next.png

 HDL-ON_Android/Assets/Phone/PirIcon/offline.png

 HDL-ON_Android/Assets/Phone/PirIcon/online.png

 HDL-ON_Android/Assets/Phone/PirIcon/priequipment.png

 HDL-ON_Android/Assets/Phone/PirIcon/projector.png

 HDL-ON_Android/Assets/Phone/PirIcon/search.png

 HDL-ON_Android/Assets/Phone/PirIcon/succeed.png

 HDL-ON_Android/Assets/Phone/PirIcon/tv.png

 HDL-ON_iOS/Resources/Phone/PirIcon/Infraredtreasure.png

 HDL-ON_iOS/Resources/Phone/PirIcon/adddevice.png

 HDL-ON_iOS/Resources/Phone/PirIcon/addlbuton.png

 HDL-ON_iOS/Resources/Phone/PirIcon/air.png

 HDL-ON_iOS/Resources/Phone/PirIcon/custom.png

 HDL-ON_iOS/Resources/Phone/PirIcon/del.png

 HDL-ON_iOS/Resources/Phone/PirIcon/delbuton.png

 HDL-ON_iOS/Resources/Phone/PirIcon/dropdown.png

 HDL-ON_iOS/Resources/Phone/PirIcon/dvd.png

 HDL-ON_iOS/Resources/Phone/PirIcon/fan.png

 HDL-ON_iOS/Resources/Phone/PirIcon/next.png

 HDL-ON_iOS/Resources/Phone/PirIcon/offline.png

 HDL-ON_iOS/Resources/Phone/PirIcon/online.png

 HDL-ON_iOS/Resources/Phone/PirIcon/priequipment.png

 HDL-ON_iOS/Resources/Phone/PirIcon/projector.png

 HDL-ON_iOS/Resources/Phone/PirIcon/search.png

 HDL-ON_iOS/Resources/Phone/PirIcon/stb.png

 HDL-ON_iOS/Resources/Phone/PirIcon/tv.png

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

@@ -127,7 +127,7 @@
            //吸力调节

            this.btnSuctionIcon = new IconViewControl(28);

            btnSuctionIcon.Y = ImageControl.Bottom + Application.GetRealHeight(64);

            btnSuctionIcon.X = Application.GetRealWidth(33);

            //btnSuctionIcon.X = Application.GetRealWidth(33);

            btnSuctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/Suction.png";

            btnSuctionIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/SuctionSelect.png";

            FrameWhiteCentet1.AddChidren(btnSuctionIcon);

@@ -138,7 +138,7 @@
            };

            this.btnSuctionView = new NormalViewControl(80, 54, true);

            btnSuctionView.Y = btnSuctionIcon.Bottom + Application.GetRealHeight(10);

            btnSuctionView.X = btnSuctionIcon.X - (Application.GetRealWidth(80) - btnSuctionIcon.Width) / 2;

            //btnSuctionView.X = btnSuctionIcon.X - (Application.GetRealWidth(80) - btnSuctionIcon.Width) / 2;

            btnSuctionView.TextAlignment = TextAlignment.TopCenter;

            btnSuctionView.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;

            btnSuctionView.Text = Language.StringByID(StringId.SuctionAdjustment);

@@ -149,7 +149,8 @@
            this.btnChargeIcon = new IconViewControl(28);

            btnChargeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/ChargeSelect.png";

            btnChargeIcon.Y = btnSuctionIcon.Y;

            btnChargeIcon.X = btnSuctionIcon.Right + Application.GetRealWidth(50);

            //btnChargeIcon.X = btnSuctionIcon.Right + Application.GetRealWidth(50);

            btnChargeIcon.Gravity = Gravity.CenterHorizontal;

            FrameWhiteCentet1.AddChidren(btnChargeIcon);

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

            {

@@ -164,6 +165,10 @@
            btnChargeView.TextID = StringId.Charge;

            FrameWhiteCentet1.AddChidren(btnChargeView);



            //2021.03.09 舍弃掉静音功能

            btnSuctionIcon.X = btnChargeIcon.X - btnSuctionIcon.IconSize - Application.GetRealWidth(50);

            btnSuctionView.X = btnSuctionIcon.X - (Application.GetRealWidth(80) - btnSuctionIcon.Width) / 2;



            //声音图标

            this.btnVoiceIcon = new IconViewControl(28);

            btnVoiceIcon.Y = btnSuctionIcon.Y;

@@ -171,7 +176,7 @@
            btnVoiceIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/Voice.png";

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

            btnVoiceIcon.IsSelected = true;

            FrameWhiteCentet1.AddChidren(btnVoiceIcon);

            //FrameWhiteCentet1.AddChidren(btnVoiceIcon);

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

            {

                //发送静音命令

@@ -183,12 +188,13 @@
            btnVoiceView.TextAlignment = TextAlignment.TopCenter;

            btnVoiceView.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;

            btnVoiceView.TextID = StringId.Mute;

            FrameWhiteCentet1.AddChidren(btnVoiceView);

            //FrameWhiteCentet1.AddChidren(btnVoiceView);



            //清扫模式图标

            this.btnModeIcon = new IconViewControl(28);

            btnModeIcon.Y = btnSuctionIcon.Y;

            btnModeIcon.X = btnVoiceIcon.Right + Application.GetRealWidth(50);

            //btnModeIcon.X = btnVoiceIcon.Right + Application.GetRealWidth(50);

            btnModeIcon.X = btnChargeIcon.Right + Application.GetRealWidth(50);

            btnModeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/Clean.png";

            FrameWhiteCentet1.AddChidren(btnModeIcon);

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

@@ -220,26 +226,28 @@
            btnTitleName.TextID = StringId.WeepRobot;

            FrameWhiteCentet2.AddChidren(btnTitleName);



            //2021.03.09 舍弃耗材管理

            //耗材管理

            var rowManment = new FrameRowControl();

            rowManment.Height = Application.GetRealHeight(50);

            rowManment.Width = FrameWhiteCentet2.Width;

            rowManment.Y = Application.GetRealHeight(75);

            FrameWhiteCentet2.AddChidren(rowManment);

            rowManment.AddLeftCaption(Language.StringByID(StringId.ConsumablesManagement), 200);

            rowManment.AddBottomLine();

            rowManment.AddRightArrow();

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

            {

                var form = new TuyaWeepRobotConsumablesMagPage();

                form.AddForm(this.device, this.weepRobotData);

            };

            //var rowManment = new FrameRowControl();

            //rowManment.Height = Application.GetRealHeight(50);

            //rowManment.Width = FrameWhiteCentet2.Width;

            //rowManment.Y = Application.GetRealHeight(75);

            //FrameWhiteCentet2.AddChidren(rowManment);

            //rowManment.AddLeftCaption(Language.StringByID(StringId.ConsumablesManagement), 200);

            //rowManment.AddBottomLine();

            //rowManment.AddRightArrow();

            //rowManment.ButtonClickEvent += (sender, e) =>

            //{

            //    var form = new TuyaWeepRobotConsumablesMagPage();

            //    form.AddForm(this.device, this.weepRobotData);

            //};



            //历史记录

            var rowHistory = new FrameRowControl();

            rowHistory.Height = Application.GetRealHeight(50);

            rowHistory.Width = FrameWhiteCentet2.Width;

            rowHistory.Y = rowManment.Bottom;

            //rowHistory.Y = rowManment.Bottom;

            rowHistory.Y = Application.GetRealHeight(75);

            FrameWhiteCentet2.AddChidren(rowHistory);

            rowHistory.AddLeftCaption(Language.StringByID(StringId.HistoryLog), 200);

            rowHistory.AddBottomLine();

@@ -327,12 +335,15 @@
            };

            frameBack.Show();



            //2021.03.09 舍弃随机清扫

            //菜单控件(清扫模式)

            var menuContr = new DialogTitleMenuControl(4, Language.StringByID(StringId.CleanMode));

            //var menuContr = new DialogTitleMenuControl(4, Language.StringByID(StringId.CleanMode));

            var menuContr = new DialogTitleMenuControl(3, Language.StringByID(StringId.CleanMode));

            menuContr.X = Application.GetRealWidth(210);

            menuContr.Y = Application.GetRealHeight(197);

            menuContr.Width = Application.GetRealWidth(160);

            menuContr.Height = Application.GetRealHeight(243);

            //menuContr.Height = Application.GetRealHeight(243);

            menuContr.Height = Application.GetRealHeight(203);

            dialogBody.AddChidren(menuContr);



            //自动清扫

@@ -345,13 +356,13 @@
            });



            //随机清扫

            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 == "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";

@@ -520,13 +531,14 @@
                this.btnModeIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/AutoModeSelect.png";

                this.btnModeView.TextID = StringId.AutoClean;

            }

            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.RandomClean;

            }

            //2021.03.09 舍弃随机清扫

            //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.RandomClean;

            //}

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

            {

                //沿墙清扫