2021-5-20-1

JLChen

2021-05-20 57ddcc855793fd41d1dca73bc1b6006713859d55

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
using Shared;
@@ -75,7 +76,7 @@
                    ////关闭刷新View；
                    vv.EndHeaderRefreshing();

                    Method.GetControlList(this, () =>
                    PirMethod.GetControlList(this, () =>
                    {
                        Application.RunOnMainThread(() =>
                        {
@@ -107,7 +108,7 @@
                    //1=空调;2=电视;3=风扇;4=机顶盒;5=DVD/EVD/VCD;6=投影仪;7=自定义;
                    if (if_value == 7)
                    {
                        Method method = new Method();
                        PirMethod method = new PirMethod();
                        method.AddControl(this, (control) =>
                        {
                           //成功后移除;
@@ -120,7 +121,7 @@
                    }
                    else
                    {
                        if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
                        if (if_value == 6)
                        {
                            new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
                            return;
@@ -147,7 +148,6 @@
            #endregion
            ///初始化界面
            UIView(vv);

        }
        /// <summary>
        /// 加载UI界面
@@ -208,7 +208,7 @@
                    TipPopView tipPopView = new TipPopView();
                    tipPopView.TipBox(StringId.tip, text, (dialog) =>
                    {
                        Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
                        PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
                        {
                            dialog.Close();
                            var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
@@ -289,27 +289,34 @@
                {
                    //清空之前数据
                    DeviceTypeList.Clear();
                    var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
                    for (int a = 0; a < jArray.Count; a++)
                    try
                    {
                        var jay = jArray[a];
                        var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
                        var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
                        if (objDeviceType != null)
                        var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
                        for (int a = 0; a < jArray.Count; a++)
                        {
                            if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
                            var jay = jArray[a];
                            var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
                            var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
                            if (objDeviceType != null)
                            {
                                DeviceTypeList.Add(objDeviceType);
                                if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
                                {
                                    DeviceTypeList.Add(objDeviceType);
                                }
                            }
                        }
                        action();
                    }
                    action();
                    catch
                    {

                    }
                }
                else
                {
                    if (tag)
                    {
                        Method method = new Method();
                        PirMethod method = new PirMethod();
                        method.ErrorShow(responsePackNew, "");
                    }
                }
@@ -328,25 +335,35 @@
                {
                    //清空之前数据
                    brandList.Clear();
                    var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
                    for (int a = 0; a < jArray.Count; a++)
                    try
                    {
                        var jay = jArray[a];
                        var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
                        var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str);
                        if (brand != null)
                        var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
                        for (int a = 0; a < jArray.Count; a++)
                        {
                            if (null == brandList.Find((c) => c.id == brand.id))
                            var jay = jArray[a];
                            var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
                            var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str);
                            if (brand != null)
                            {
                                brandList.Add(brand);
                                if (null == brandList.Find((c) => c.id == brand.id))
                                {
                                    brandList.Add(brand);
                                }
                            }
                        }
                    }
                    actionBrand(brandList);
                    catch { }
                    finally
                    {
                        Application.RunOnMainThread(() =>
                        {
                            actionBrand(brandList);
                        });
                    }
                }
                else
                {
                    Method method = new Method();
                    PirMethod method = new PirMethod();
                    method.ErrorShow(responsePackNew, "");
                }
            }, id, "品牌列表");