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

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -3,7 +3,6 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
#if __Android__
using Java.Interop;
using Android.Content;
@@ -24,7 +23,6 @@
            brand = integratedBrand;
        }


        public void LoadPage()
        {
            Action<string, string> action = (s, a) =>
@@ -34,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);
@@ -66,7 +66,7 @@
                {
                    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());

@@ -116,10 +116,6 @@
            bool isFrist = true;
            foreach (var device in deviceList)
            {
                //if (!this.CheckSupportDevice(device))
                //{
                //    continue;
                //}
                var row = new RowLayout()
                {
                    Height = Application.GetRealHeight(50),
@@ -205,21 +201,6 @@
                            {
                                contentView.BeginHeaderRefreshing();
                            };
                            break;
                        case SPK.VideoDoorLock:
                            {
                                CommonMethod.Current.MainThread(() =>
                                {
                                    //萤石视频门锁
                                    var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
                                    {
                                        row.RemoveFromParent();
                                    });
                                    MainPage.BasePageView.AddChidren(form);
                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                    form.Show();
                                });
                            }
                            break;
                    }
                };
@@ -371,10 +352,6 @@
        {

            if (function == null) return false;
            if (function.spk == SPK.VideoDoorLock)
            {
                return false;
            }
            return true;

        }