Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2023-02-14 c88a3777ab456af4ecf01604f4b2ae4762852148

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -12,7 +12,11 @@

namespace HDL_ON.UI
{
    public partial class HomePage : VerticalRefreshLayout
#if __IOS__
    public partial class HomePage :  VerticalRefreshLayout
#else
    public partial class HomePage : VerticalScrolViewLayout
#endif
    {

        #region 控件列表
@@ -91,21 +95,21 @@
        /// 功能区域集合
        /// </summary>
        List<FrameLayout> functionViews;
        #endregion
#endregion

        #region 区域变量
#region 区域变量
        /// <summary>
        /// 当前显示对控制类型是否是设备功能控制
        /// </summary>
        bool CurShowTypeIsFunction = true;
        #endregion
#endregion

        #region 报警信息
#region 报警信息
        Button btnMsgBg;
        Button btnMsgTime;
        Button btnMsg;
        Button btnMsgIcon;
        #endregion
#endregion

        public HomePage()
        {
@@ -133,9 +137,34 @@
            MainPage.CurPageIndex = 0;
            try
            {
                this.BeginHeaderRefreshingAction = () =>
                bodyView.RemoveAll();
#if __IOS__
                bodyView.BeginHeaderRefreshingAction = () =>
                {
                    this.EndHeaderRefreshing();
                    bodyView.EndHeaderRefreshing();
                    Common.ApiUtlis.Ins.DownloadData();
                    LoadContentView();
                    if (!CurShowTypeIsFunction)
                    {
                        contentView.PageIndex = 1;
                    }
                };
                topView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(216),
                    BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
                };
                bodyView.AddChidren(topView);
#else
                VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout()
                {
                    Height = Application.GetRealHeight(216),
                    BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
                };
                bodyView.AddChidren(refreshLayout);
                refreshLayout.BeginHeaderRefreshingAction = () =>
                {
                    refreshLayout.EndHeaderRefreshing();
                    Common.ApiUtlis.Ins.DownloadData();
                    LoadContentView();
                    if(!CurShowTypeIsFunction)
@@ -143,17 +172,15 @@
                        contentView.PageIndex = 1;
                    }
                };

                #region topView

                bodyView.RemoveAll();

                topView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(216),
                    BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
                };
                bodyView.AddChidren(topView);
                refreshLayout.AddChidren(topView);
#endif
                #region topView



                Button btnTop;
                btnTop = new Button()
@@ -180,7 +207,7 @@
                    //X = Application.GetRealWidth(16),
                    Y = btnResidenceName.Bottom,
                    Height = Application.GetRealWidth(14),
                    BackgroundColor = CSS_Color.LinkTipFail,
                    //BackgroundColor = CSS_Color.LinkTipFail,
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
@@ -198,45 +225,43 @@
                    //St_00009073b431d8b2490c9df0c5cb0e73
                    //Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
                    //Com.Hdl.HdlToLc.OpenActivity();
                    new System.Threading.Thread(() =>
                    {
                        var http = new HttpServerRequest();
                        var pack = http.GetLcSubAccountToken();
                        if (pack.Code == StateCode.SUCCESS)
                        {
                            if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                                });
                            }
                            Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
                            Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
                            Application.RunOnMainThread(() =>
                            {
                                //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
                                //Com.Utils.HdlToLcUtils.Instance.Play()

                                var backTemp = new AddLcCam();
                                backTemp.backAction = () =>
                                {
                                    //Load3tyBrandDeviceList();
                                };
                                Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);

                            });
                        }
                        else
                        {
                            Application.RunOnMainThread(() =>
                            {
                                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                    //new System.Threading.Thread(() =>
                    //{
                    //    var http = new HttpServerRequest();
                    //    var pack = http.GetLcSubAccountToken();
                    //    if (pack.Code == StateCode.SUCCESS)
                    //    {
                    //        if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
                    //        {
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                    //            });
                    //        }
                    //        Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                    //        Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
                    //        Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
                    //            //Com.Utils.HdlToLcUtils.Instance.Play()
                    //            var backTemp = new AddLcCam();
                    //            backTemp.backAction = () =>
                    //            {
                    //                //Load3tyBrandDeviceList();
                    //            };
                    //            Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
                    //        });
                    //    }
                    //    else
                    //    {
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
                    //        });
                    //    }
                    //})
                    //{ IsBackground = true }.Start();
                };
#endif

@@ -248,7 +273,7 @@
                topView.AddChidren(environmentalView);
                CheckLinkStatus();//2020-12-22

                #region 环境数据
#region 环境数据
                var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
                var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
                var enviList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => SPK.EvironmentSensorList().Contains(obj.spk));
@@ -424,7 +449,7 @@
                };
                btnPm25Values.Width = btnPm25Values.GetTextWidth();
                environmentalView.AddChidren(btnPm25Values);
                #endregion
#endregion

                btnSecurityStatus = new Button()
                {
@@ -465,7 +490,7 @@
                }


                #region msg
#region msg
                FrameLayout msgView;
                msgView = new FrameLayout()
                {
@@ -520,11 +545,11 @@

                LoadEvent_GotoMessageCenterPage();

                #endregion
#endregion

                #endregion
#endregion

                #region 功能场景切换
#region 功能场景切换

                bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });

@@ -573,9 +598,9 @@
                    TextAlignment = TextAlignment.Center,
                };
                changeView.AddChidren(btnChangeScene);
                #endregion
#endregion

                #region ContextView
#region ContextView
                contentView = new PageLayout()
                {
                    //Y = changeView.Bottom,
@@ -588,7 +613,7 @@

                LoadContentView();

                #endregion
#endregion
            }
            catch (Exception ex)
            {
@@ -602,7 +627,7 @@
        /// </summary>
        void LoadContentView()
        {
            if (!Common.ApiUtlis.Ins.DownloadDataComplete)
            if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
            {
                var waitPage = new Loading();
                MainPage.BaseView.AddChidren(waitPage);
@@ -692,7 +717,7 @@
        /// </summary>
        void LoadDeviceFunctionControlZone()
        {
            #region ContextView
#region ContextView
            deviceFunctionView.RemoveAll();
            functionViews.Clear();
            var rowView = new FrameLayout();
@@ -792,7 +817,7 @@
                MainPage.Log("homepage error : " + ex.Message);
            }
            deviceFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
            #endregion
#endregion

        }
        /// <summary>