Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

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

@@ -25,7 +25,7 @@
            {
                var page = new AddDevciePage(brand);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                page.LoadPage(contentView);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
@@ -46,6 +46,8 @@
                contentView.EndHeaderRefreshing();
                Load3tyBrandDeviceList();
            };

            //contentView.BeginHeaderRefreshing();
        }

        void Load3tyBrandDeviceList()
@@ -55,14 +57,27 @@
            new System.Threading.Thread(() => {
                try
                {
                    var pm = new DAL.Server.HttpServerRequest();
                    var pm = new HttpServerRequest();
                    var pack = pm.Get3TyBrandBindDeviceList(brand.productPlatform, brand.productBrand);
                    if (pack.Code == DAL.Server.StateCode.SUCCESS)
                    {
                        var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());

                        Application.RunOnMainThread(() =>
                        {
                            LoadRow(revData.list);
                            contentView.RemoveAll();
                            if (revData.list.Count > 0)
                            {
                                LoadRow(revData.list);
                            }
                            else
                            {
                                var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
                                {
                                    Gravity = Gravity.CenterHorizontal,
                                };
                                contentView.AddChidren(tipView);
                            }
                        });
                    }
                    else
@@ -84,7 +99,6 @@

        void LoadRow(List<Function> deviceList)
        {
            contentView.RemoveAll();
            bool isFrist = true;
            foreach (var device in deviceList)
            {
@@ -150,7 +164,15 @@
                    switch (device.spk)
                    {
                        case SPK.IrModule:
                            new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
                            new UI2.PersonalCenter.PirDevice.PirMethod().MainView(this, device,()=> {});
                            break;
                        case SPK.SenesorMegahealth:
                            var smPage = new SenesorMegahealthManagerPage();
                            smPage.AddForm(device);
                            smPage.DelDeviceEvent = () =>
                            {
                                contentView.BeginHeaderRefreshing();
                            };
                            break;
                    }
                };