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 |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 96c0947..152714a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -95,6 +95,7 @@
                 Y = Application.GetRealHeight(64),
                 Height = Application.GetRealWidth(117),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
+                HorizontalScrollBarEnabled = false//闅愯棌婊氬姩鏉�
             };
             bodyView.AddChidren(menuView);
 
@@ -139,7 +140,7 @@
 #endif
 
             };
-#endregion
+            #endregion
 
             #region 鍒嗕韩涓庡姛鑳�
             shareMenuButton = new MenuButton()
@@ -159,7 +160,7 @@
             shareMenuButton.SelectAction = shateAction;
             #endregion
 
-#region 鎶ヨ绫�
+            #region 鎶ヨ绫�
             alarmMenuButton = new MenuButton()
             {
                 X = shareMenuButton.Right,
@@ -174,9 +175,9 @@
                 MenuButtonSelect(2);
             };
             alarmMenuButton.SelectAction = alarmAction;
-#endregion
+            #endregion
 
-#region 绯荤粺淇℃伅
+            #region 绯荤粺淇℃伅
             systemMenuButton = new MenuButton()
             {
                 X = alarmMenuButton.Right,
@@ -199,10 +200,11 @@
                 X = systemMenuButton.Right,
                 Y = Application.GetRealWidth(16),
             };
-            //menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
+            menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
             propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
             propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
-            propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
+            propertyMenuButton.TextButton.TextID = StringId.Propertynotice;
+            propertyMenuButton.TextButton.IsMoreLines = true;
             Action propertyAction = () =>
             {
                 MenuButtonSelect(4);
@@ -211,11 +213,12 @@
             #endregion
 
             //鍏堝睆钄�
-            ////鍙硃addingView 
-            //menuView.AddChidren(new Button() {
-            //    Width = Application.GetRealWidth(15),
-            //    BackgroundColor = CSS_Color.viewTranslucence
-            //});
+            //鍙硃addingView 
+            menuView.AddChidren(new Button()
+            {
+                Width = Application.GetRealWidth(15),
+                BackgroundColor = CSS_Color.viewTranslucence
+            });
 
         }
 
@@ -294,6 +297,8 @@
                 propertyMenuButton.IsSelected = true;
 
             }
+
+            menuView.ScrollToX(selectId * Application.GetRealWidth(40));
 
             GetPushMessageList(showMesType);
         }
@@ -412,7 +417,7 @@
             //btnTilte.MouseUpEventHandler = eventHandler;
             //btnSubtitle.MouseUpEventHandler = eventHandler;
 
-           
+
         }
 
         /// <summary>
@@ -446,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);
@@ -511,7 +522,7 @@
         void GetPushMessageList(int queryType = 0)
         {
             bodyScrolView.RemoveAll();
-            if(PushMessageInfoList == null)
+            if (PushMessageInfoList == null)
             {
                 PushMessageInfoList = new List<PushMessageInfo>();
             }
@@ -519,7 +530,7 @@
             {
                 PushMessageInfoList.Clear();
             }
-          
+
             YearMark = "";//鏍囪娓呯┖
             if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
             {
@@ -538,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)
@@ -606,7 +624,7 @@
             }
         }
 
-#region 娴嬭瘯
+        #region 娴嬭瘯
 #if DEBUG
         /// <summary>
         /// 
@@ -681,7 +699,7 @@
 
 #endif
 
-#endregion
+        #endregion
 
         /// <summary>
         /// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�
@@ -789,4 +807,14 @@
         public long createTime;
     }
 
+
+    /// <summary>
+    // 鎺ㄩ�佹秷鎭垎椤靛璞�
+    /// </summary>
+    public class PushMessageInfoList : BasePagingObj
+    {
+        public List<PushMessageInfo> list = new List<PushMessageInfo>();
+
+    }
+
 }

--
Gitblit v1.8.0