2023年10月30日14:37:07

mac

2023-10-30 db2f0bac3aab27db1efc2fbb3e58ab14dfc06922

2023年10月30日14:37:07

按视觉走样优化海信电视UI

 HDL-ON_Android/Assets/Phone/LogicIcon/electricaltvhisense.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -619,6 +619,7 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1780,6 +1780,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Phone/LogicIcon/electricaltvhisense.png

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -370,6 +370,10 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (SPK.ElectricalTvHisense == device.spk)
            {
                return "LogicIcon/electricaltvhisense.png";
            }
            return $"FunctionIcon/Icon/{device.IconName}.png";

        }

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -375,7 +375,7 @@
            {
                Y = Application.GetRealHeight(24),
                X = Application.GetRealWidth(24),
                Height = Application.GetRealHeight(648),
                Height = Application.GetRealHeight(648-60),
                Width = Application.GetRealWidth(327),
                BackgroundImagePath = "HisenseTv/onbj.png",
            };
@@ -458,11 +458,11 @@

            var yinliangFL = new FrameLayout();
            backgroundOpenFl.AddChidren(yinliangFL);
            yinliangFL.Height = Application.GetRealHeight(146);
            yinliangFL.Height = Application.GetRealHeight(146-16);
            yinliangFL.Width = Application.GetRealWidth(68);
            yinliangFL.Y = Application.GetRealHeight(260);
            yinliangFL.Y = Application.GetRealHeight(260-8-20);
            yinliangFL.X = shouyeFL.X;
            yinliangFL.BackgroundColor = 0xffF2F3F7;
            yinliangFL.BackgroundColor = 0xFFF2F3F7;
            yinliangFL.Radius = (uint)Application.GetRealWidth(34);

            btn_jia = new Button
@@ -478,7 +478,7 @@
            yinliangFL.AddChidren(btn_jia);
            Button btnText = new Button
            {
                Y = Application.GetRealHeight(63),
                Y = Application.GetRealHeight(63-8),
                Height = Application.GetRealHeight(20),
                //Text = "音量",
                TextID = StringId.yinliang,
@@ -490,7 +490,7 @@
            yinliangFL.AddChidren(btnText);
            btn_jian = new Button
            {
                Y = Application.GetRealHeight(98),
                Y = Application.GetRealHeight(98-8),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
                UnSelectedImagePath = "HisenseTv/yingliangjian.png",
@@ -500,36 +500,37 @@
            };
            yinliangFL.AddChidren(btn_jian);

            int bottomValue= 4;
            caidanBtn = new CustomButton();
            caidanBtn.TextID = StringId.caidan;
            caidanBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
            caidanBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
            caidanBtn.X = shouyeFL.X;
            backgroundOpenFl.AddChidren(caidanBtn);

            bofangBtn = new CustomButton();
            bofangBtn.TextID = StringId.bofang;
            bofangBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
            bofangBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
            bofangBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(bofangBtn);


            zantingBtn = new CustomButton();
            zantingBtn.TextID = StringId.zanting;
            zantingBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
            zantingBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
            zantingBtn.X = bofangBtn.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(zantingBtn);


            int bottomValue1 = 8;
            kuaijinBtn = new CustomButton();
            kuaijinBtn.TextID = StringId.kuaijin;
            kuaijinBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(16);
            kuaijinBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
            kuaijinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(kuaijinBtn);


            kauituiBtn = new CustomButton();
            kauituiBtn.TextID = StringId.kuaitui;
            kauituiBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(16);
            kauituiBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
            kauituiBtn.X = kuaijinBtn.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(kauituiBtn);

@@ -538,14 +539,14 @@

            jingyinBtn = new CustomButton();
            jingyinBtn.TextID = StringId.jingyin;
            jingyinBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(16);
            jingyinBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
            jingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(jingyinBtn);


            shezhiBtn = new CustomButton();
            shezhiBtn.TextID = StringId.shezhi;
            shezhiBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(16);
            shezhiBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
            shezhiBtn.X = jingyinBtn.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(shezhiBtn);

@@ -553,28 +554,28 @@

            jiechujingyinBtn = new CustomButton();
            jiechujingyinBtn.TextID = StringId.jiechujingyin;
            jiechujingyinBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(16);
            jiechujingyinBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
            jiechujingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(jiechujingyinBtn);


            fanhuiBtn = new CustomButton();
            fanhuiBtn.TextID = StringId.fanhui;
            fanhuiBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(16);
            fanhuiBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
            fanhuiBtn.X = jiechujingyinBtn.Right + Application.GetRealWidth(37);
            backgroundOpenFl.AddChidren(fanhuiBtn);


            TypeFrameLayout typeFrameLayout = new TypeFrameLayout();
            typeFrameLayout.middLayout.Y = yinliangFL.Bottom + Application.GetRealHeight(32);
            typeFrameLayout.middLayout.Y = yinliangFL.Bottom + Application.GetRealHeight(16);
            typeFrameLayout.AddView(backgroundOpenFl);

            muenFrameLayout = new MenuFramLayout();
            muenFrameLayout.Y = Application.GetRealHeight(482);
            muenFrameLayout.Y = Application.GetRealHeight(482-60);
            muenFrameLayout.AddView(backgroundOpenFl);

            sourceFrameLayout = new SourceFrameLayout();
            sourceFrameLayout.Y = Application.GetRealHeight(482);
            sourceFrameLayout.Y = Application.GetRealHeight(482-60);
            backgroundOpenFl.AddChidren(sourceFrameLayout);
            sourceFrameLayout.LoadSourcePage();

@@ -733,8 +734,8 @@
            this.SelectedTextColor = MusicColor.MusicTxet14SelectedColor;
            this.TextAlignment = TextAlignment.Center;
            this.IsMoreLines = true;
            this.BackgroundColor = 0xffECEDEE;
            this.SelectedBackgroundColor = 0xFFF2F3F7;
            this.BackgroundColor = 0xFFF2F3F7;
            this.SelectedBackgroundColor = 0xffECEDEE;
            this.Radius = (uint)Application.GetRealHeight(19);
            this.Padding = new Padding(0, 0, 0, 0);
        }
@@ -867,7 +868,7 @@
            rightLayout.AddChidren(clickRightLayout);

            leftBtnTitle.Width = leftLayout.Width;
            leftBtnLine.Y = leftBtnTitle.Bottom + Application.GetRealHeight(4);
            leftBtnLine.Y = leftBtnTitle.Bottom + Application.GetRealHeight(0);
            if (leftBtnTitle.GetTextWidth() < leftBtnTitle.Width)
            {
                leftBtnTitle.Width = leftBtnTitle.GetTextWidth();
@@ -884,7 +885,7 @@



            rightBtnLine.Y = rightBtnTitle.Bottom + Application.GetRealHeight(4);
            rightBtnLine.Y = rightBtnTitle.Bottom + Application.GetRealHeight(0);

            if (rightBtnTitle.GetTextWidth() < rightBtnTitle.Width)
            {