Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-28 299f4b1218c0d3721aa92bf091950d6708942583

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

@@ -27,16 +27,17 @@
        /// <summary>
        /// menuView
        /// </summary>
        FrameLayout menuView;
        HorizontalScrolViewLayout menuView;//2021-08-27 增加多了一个菜单按钮所以改为滚动控件
        MenuButton allMenuButton;
        MenuButton shareMenuButton;
        MenuButton alarmMenuButton;
        MenuButton systemMenuButton;
        MenuButton propertyMenuButton;//增加物业通知按钮
        FrameLayout messageView;

        /// <summary>
        /// 显示的消息类型
        /// 0全部 1分享与功能 2报警类 3系统信息
        /// 0全部 1分享与功能 2报警类 3系统信息 4物业公告
        /// </summary>
        int showMesType = 0;
        /// <summary>
@@ -89,14 +90,21 @@
        void AddTopMenuView()
        {

            menuView = new FrameLayout()
            menuView = new HorizontalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealWidth(117),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                HorizontalScrollBarEnabled = false//隐藏滚动条
            };
            bodyView.AddChidren(menuView);

            //左padding View
            menuView.AddChidren(new Button()
            {
                Width = Application.GetRealWidth(15),
                BackgroundColor = CSS_Color.viewTranslucence
            });

            #region 全部按钮
            allMenuButton = new MenuButton()
@@ -184,7 +192,31 @@
                MenuButtonSelect(3);
            };
            systemMenuButton.SelectAction = systemAction;
#endregion
            #endregion

            #region 物业通知
            propertyMenuButton = new MenuButton()
            {
                X = systemMenuButton.Right,
                Y = Application.GetRealWidth(16),
            };
            //menuView.AddChidren(propertyMenuButton); //先屏蔽
            propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
            propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
            propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
            Action propertyAction = () =>
            {
                MenuButtonSelect(4);
            };
            propertyMenuButton.SelectAction = propertyAction;
            #endregion

            //先屏蔽
            ////右paddingView 
            //menuView.AddChidren(new Button() {
            //    Width = Application.GetRealWidth(15),
            //    BackgroundColor = CSS_Color.viewTranslucence
            //});

        }

@@ -214,7 +246,7 @@
        /// <summary>
        /// 
        /// </summary>
        /// <param name="selectId">0全部 1分享与功能 2报警类 3系统信息</param>
        /// <param name="selectId">0全部 1分享与功能 2报警类 3系统信息 4物业通知</param>
        void MenuButtonSelect(int selectId)
        {
            showMesType = selectId;
@@ -225,6 +257,7 @@
                shareMenuButton.IsSelected = true;
                alarmMenuButton.IsSelected = true;
                systemMenuButton.IsSelected = true;
                propertyMenuButton.IsSelected = true;

            }
            else if (selectId == 1)
@@ -233,6 +266,7 @@
                shareMenuButton.IsSelected = true;
                alarmMenuButton.IsSelected = false;
                systemMenuButton.IsSelected = false;
                propertyMenuButton.IsSelected = false;

            }
            else if (selectId == 2)
@@ -241,6 +275,7 @@
                shareMenuButton.IsSelected = false;
                alarmMenuButton.IsSelected = true;
                systemMenuButton.IsSelected = false;
                propertyMenuButton.IsSelected = false;
            }
            else if (selectId == 3)
            {
@@ -248,6 +283,16 @@
                shareMenuButton.IsSelected = false;
                alarmMenuButton.IsSelected = false;
                systemMenuButton.IsSelected = true;
                propertyMenuButton.IsSelected = false;

            }
            else if (selectId == 4)
            {
                allMenuButton.IsSelected = false;
                shareMenuButton.IsSelected = false;
                alarmMenuButton.IsSelected = false;
                systemMenuButton.IsSelected = false;
                propertyMenuButton.IsSelected = true;

            }

@@ -494,7 +539,13 @@
                    var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
                    if (result.Code == StateCode.SUCCESS)
                    {
                        PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
                        //PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
                        //2021-08-28 改为分页接口
                        var mPushMesList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
                        if(mPushMesList != null) {
                            PushMessageInfoList = mPushMesList.list;
                        }

                        Application.RunOnMainThread(() =>
                        {
                            if (PushMessageInfoList != null && PushMessageInfoList.Count > 0)
@@ -745,4 +796,14 @@
        public long createTime;
    }


    /// <summary>
    // 推送消息分页对象
    /// </summary>
    public class PushMessageInfoList : BasePagingObj
    {
        public List<PushMessageInfo> list = new List<PushMessageInfo>();

    }

}