Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs

@@ -11,7 +11,7 @@
using Shared;
namespace HDL_ON.UI
{
    public class DeviceListPage  : FrameLayout
    public class DeviceListPage : FrameLayout
    {
        FrameLayout bodyView;
        VerticalRefreshLayout contentView;
@@ -23,7 +23,6 @@
            brand = integratedBrand;
        }


        public void LoadPage()
        {
            Action<string, string> action = (s, a) =>
@@ -33,13 +32,15 @@
                page.LoadPage(contentView);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Devices));
            topView.maginY = 10;
            topView.LoadTopView_AddIcon("3ty", action);
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            contentView = new VerticalRefreshLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
                VerticalScrollBarEnabled = false,
            };
            bodyView.AddChidren(contentView);
@@ -59,12 +60,13 @@
        {
            var waitPage = new Loading();
            waitPage.Start();
            new System.Threading.Thread(() => {
            new System.Threading.Thread(() =>
            {
                try
                {
                    var pm = new HttpServerRequest();
                    var pack = pm.Get3TyBrandBindDeviceList(brand.productPlatform, brand.productBrand);
                    if (pack.Code == DAL.Server.StateCode.SUCCESS)
                    if (pack.Code == StateCode.SUCCESS)
                    {
                        var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());

@@ -77,7 +79,7 @@
                            }
                            else
                            {
                                var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
                                var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices), 160)
                                {
                                    Gravity = Gravity.CenterHorizontal,
                                };
@@ -96,7 +98,8 @@
                }
                finally
                {
                    Application.RunOnMainThread(() => {
                    Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
@@ -168,7 +171,8 @@
                };
                row.AddChidren(btnName);

                btnName.MouseUpEventHandler = (sender, e) => {
                btnName.MouseUpEventHandler = (sender, e) =>
                {
                    switch (device.spk)
                    {
                        case SPK.IrModule:
@@ -187,7 +191,8 @@
                                contentView.BeginHeaderRefreshing();
                            };
                            break;
                        case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                        case SPK.SensorEnvironment:
                        case SPK.SensorEnvironmentHailin:
                        case SPK.SensorEnvironment2:
                        case SPK.SensorEnvironment3:
                            var smPage1 = new SensorEnvironmentManagerPage();
@@ -267,7 +272,8 @@
                        Width = Application.GetRealWidth(150),
                    };
                    row.AddChidren(btnEdit);
                    btnEdit.MouseUpEventHandler = (sender, e) =>{
                    btnEdit.MouseUpEventHandler = (sender, e) =>
                    {
                        Action<string> callBack = (str) =>
                        {
                            if (string.IsNullOrEmpty(str))
@@ -337,6 +343,19 @@

        }

        /// <summary>
        /// 检查是否支持
        /// </summary>
        /// <param name="function"></param>
        /// <returns></returns>
        bool CheckSupportDevice(Function function)
        {

            if (function == null) return false;
            return true;

        }

    }