From 12bda302564e919a0ba8157957df3d2ee7382909 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 14 九月 2021 15:27:51 +0800
Subject: [PATCH] 2021-09-14 1.增加物业公告推送对接

---
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs |  112 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 93 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 951e01c..152714a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/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);
 
+            //宸adding View
+            menuView.AddChidren(new Button()
+            {
+                Width = Application.GetRealWidth(15),
+                BackgroundColor = CSS_Color.viewTranslucence
+            });
 
             #region 鍏ㄩ儴鎸夐挳
             allMenuButton = new MenuButton()
@@ -132,9 +140,9 @@
 #endif
 
             };
-#endregion
+            #endregion
 
-#region 鍒嗕韩涓庡姛鑳�
+            #region 鍒嗕韩涓庡姛鑳�
             shareMenuButton = new MenuButton()
             {
                 X = allMenuButton.Right,
@@ -144,14 +152,15 @@
             shareMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/ShareOn.png";
             shareMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/Share.png";
             shareMenuButton.TextButton.TextID = StringId.SharingAndFunctionality;
+            shareMenuButton.TextButton.IsMoreLines = true;
             Action shateAction = () =>
             {
                 MenuButtonSelect(1);
             };
             shareMenuButton.SelectAction = shateAction;
-#endregion
+            #endregion
 
-#region 鎶ヨ绫�
+            #region 鎶ヨ绫�
             alarmMenuButton = new MenuButton()
             {
                 X = shareMenuButton.Right,
@@ -166,9 +175,9 @@
                 MenuButtonSelect(2);
             };
             alarmMenuButton.SelectAction = alarmAction;
-#endregion
+            #endregion
 
-#region 绯荤粺淇℃伅
+            #region 绯荤粺淇℃伅
             systemMenuButton = new MenuButton()
             {
                 X = alarmMenuButton.Right,
@@ -183,7 +192,33 @@
                 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.Propertynotice;
+            propertyMenuButton.TextButton.IsMoreLines = true;
+            Action propertyAction = () =>
+            {
+                MenuButtonSelect(4);
+            };
+            propertyMenuButton.SelectAction = propertyAction;
+            #endregion
+
+            //鍏堝睆钄�
+            //鍙硃addingView 
+            menuView.AddChidren(new Button()
+            {
+                Width = Application.GetRealWidth(15),
+                BackgroundColor = CSS_Color.viewTranslucence
+            });
 
         }
 
@@ -213,7 +248,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;
@@ -224,6 +259,7 @@
                 shareMenuButton.IsSelected = true;
                 alarmMenuButton.IsSelected = true;
                 systemMenuButton.IsSelected = true;
+                propertyMenuButton.IsSelected = true;
 
             }
             else if (selectId == 1)
@@ -232,6 +268,7 @@
                 shareMenuButton.IsSelected = true;
                 alarmMenuButton.IsSelected = false;
                 systemMenuButton.IsSelected = false;
+                propertyMenuButton.IsSelected = false;
 
             }
             else if (selectId == 2)
@@ -240,6 +277,7 @@
                 shareMenuButton.IsSelected = false;
                 alarmMenuButton.IsSelected = true;
                 systemMenuButton.IsSelected = false;
+                propertyMenuButton.IsSelected = false;
             }
             else if (selectId == 3)
             {
@@ -247,8 +285,20 @@
                 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;
+
+            }
+
+            menuView.ScrollToX(selectId * Application.GetRealWidth(40));
 
             GetPushMessageList(showMesType);
         }
@@ -302,7 +352,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                Text = pushMessageInfo.messageContent
+                Text = pushMessageInfo.messageContent,
+                //IsMoreLines = true,
             };
             rowView.AddChidren(btnTilte);
             //
@@ -366,7 +417,7 @@
             //btnTilte.MouseUpEventHandler = eventHandler;
             //btnSubtitle.MouseUpEventHandler = eventHandler;
 
-           
+
         }
 
         /// <summary>
@@ -400,7 +451,13 @@
             {
                 try
                 {
-                    var result = new HttpServerRequest().PushSerivceDeleteMessage(pushMessageInfo.id);
+                    var delPush = new PushMsgIdObj()
+                    {
+                        msgId = pushMessageInfo.id,
+                        pushType = pushMessageInfo.pushType
+                    };
+
+                    var result = new HttpServerRequest().PushSerivceDeleteMessage(delPush);
                     if (result)
                     {
                         PushMessageInfoList.Remove(pushMessageInfo);
@@ -465,7 +522,7 @@
         void GetPushMessageList(int queryType = 0)
         {
             bodyScrolView.RemoveAll();
-            if(PushMessageInfoList == null)
+            if (PushMessageInfoList == null)
             {
                 PushMessageInfoList = new List<PushMessageInfo>();
             }
@@ -473,7 +530,7 @@
             {
                 PushMessageInfoList.Clear();
             }
-          
+
             YearMark = "";//鏍囪娓呯┖
             if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
             {
@@ -492,7 +549,14 @@
                     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)
@@ -560,7 +624,7 @@
             }
         }
 
-#region 娴嬭瘯
+        #region 娴嬭瘯
 #if DEBUG
         /// <summary>
         /// 
@@ -635,7 +699,7 @@
 
 #endif
 
-#endregion
+        #endregion
 
         /// <summary>
         /// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�
@@ -743,4 +807,14 @@
         public long createTime;
     }
 
+
+    /// <summary>
+    // 鎺ㄩ�佹秷鎭垎椤靛璞�
+    /// </summary>
+    public class PushMessageInfoList : BasePagingObj
+    {
+        public List<PushMessageInfo> list = new List<PushMessageInfo>();
+
+    }
+
 }

--
Gitblit v1.8.0