~wxr/HDL_APP_Project.git

			@@ -20,7 +20,7 @@
			/// <summary>
			/// 内容为空提示View
			/// </summary>
			EmptyTipView emptyTipView;
			FrameLayout emptyTipView;

			/// <summary>
			/// menuView
			@@ -55,13 +55,18 @@
			/// <summary>
			///
			/// </summary>
			public void LoadPage()
			/// <param name="backAction"></param>
			public void LoadPage(Action backAction)
			{
			new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
			new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);

			AddTopMenuView();
			AddMessageView();
			MenuButtonSelect(showMesType);

			//测试代码
			//AddEmptyTipView();
			//TestLoad();
			}

			/// <summary>
			@@ -222,13 +227,24 @@
			/// </summary>
			void AddEmptyTipView()
			{
			emptyTipView = new EmptyTipView()
			emptyTipView = new FrameLayout()
			{
			Height = bodyScrolView.Height,
			Width = bodyScrolView.Width,
			};
			bodyScrolView.AddChidren(emptyTipView);

			var tipView = new EmptyTipView()
			{
			Gravity = Gravity.Center
			};
			messageView.AddChidren(emptyTipView);
			emptyTipView.AddChidren(tipView);
			}

			/// <summary>
			/// 年份标记
			/// </summary>
			string YearMark = "";
			/// <summary>
			/// 加载报警信息RowView
			/// </summary>
			@@ -302,7 +318,7 @@
			};


			btnDatetime.Text = Utlis.UnixToDateTime(pushMessageInfo.createTime).ToString("yyyy/MM/dd HH:mm:ss");
			btnDatetime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
			//EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
			//{
			//};
			@@ -312,12 +328,30 @@
			}

			/// <summary>
			/// 时间格式转换处理
			/// </summary>
			/// <param name="time">毫秒时间戳</param>
			/// <returns></returns>
			string GetUnixToDateTime(long time)
			{
			try
			{
			return Utlis.UnixToDateTimeWithFormatMS(time, "MM/dd HH:mm");
			}
			catch (Exception ex)
			{
			return "";
			}
			}

			/// <summary>
			/// 删除推送消息
			/// <param name="pushMessageInfo"></param>
			/// <param name="rowView"></param>
			void DeleteThePush(PushMessageInfo pushMessageInfo, RowLayout rowView)
			{
			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));

			new Thread(() =>
			@@ -388,10 +422,17 @@
			/// <param name="queryType"></param>
			void GetPushMessageList(int queryType = 0)
			{
			var waitPage = new Loading();
			waitPage.Start(Language.StringByID(StringId.PleaseWait));
			bodyScrolView.RemoveAll();
			PushMessageInfoList.Clear();
			YearMark = "";//标记清空
			if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) {
			AddEmptyTipView();
			return;
			}

			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));

			new Thread(() =>
			{
			@@ -407,6 +448,7 @@
			{

			ParseAndDisplayPushList();
			PushSerivceMarkAllMessageRead();
			}
			else
			{
			@@ -448,11 +490,27 @@
			{
			foreach (var info in PushMessageInfoList)
			{
			//年份解析判断是否需要添加年份标题
			var mesYear = Utlis.UnixToDateTimeYearMS(info.createTime);
			if (string.IsNullOrEmpty(YearMark))
			{
			//刚开始YearMark标记为空，添加第一个年份标题
			YearMark = mesYear;
			AddYearRowView(bodyScrolView, YearMark);
			}
			else if (YearMark != mesYear)
			{
			//当前信息年份和之前的不一样，重新添加一个年份标题
			YearMark = mesYear;
			AddYearRowView(bodyScrolView, YearMark);
			}

			AddRowView(bodyScrolView, info);
			}
			}

			#region 测试
			#if DEBUG
			/// <summary>
			///
			/// </summary>
			@@ -462,7 +520,7 @@
			{
			messageTitle = "报警信息",
			messageContent = "门锁被打开",
			createTime = 1606895454,
			createTime = 1606900275,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			@@ -479,19 +537,77 @@
			createTime = 1606895454,
			});

			AddYearRowView(bodyScrolView, "2020年");
			foreach (var info in PushMessageInfoList)
			PushMessageInfoList.Add(new PushMessageInfo()
			{
			AddRowView(bodyScrolView, info);
			messageTitle = "报警信息2019",
			messageContent = "门锁被打开",
			createTime = 1575277874,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			{
			messageTitle = "报警信息2019",
			messageContent = "门锁被打开",
			createTime = 1572685874,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			{
			messageTitle = "报警信息2018",
			messageContent = "门锁被打开",
			createTime = 1541149874,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			{
			messageTitle = "报警信息2017",
			messageContent = "门锁被打开",
			createTime = 1509613874,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			{
			messageTitle = "报警信息2017",
			messageContent = "门锁被打开",
			createTime = 1509613874,
			});

			PushMessageInfoList.Add(new PushMessageInfo()
			{
			messageTitle = "报警信息2017",
			messageContent = "门锁被打开",
			createTime = 1506935474,
			});

			ParseAndDisplayPushList();
			}

			AddYearRowView(bodyScrolView, "2019年");
			foreach (var info in PushMessageInfoList)
			{
			AddRowView(bodyScrolView, info);
			}
			}
			#endif

			#endregion

			/// <summary>
			/// 标记所有推送消息已读
			/// </summary>
			void PushSerivceMarkAllMessageRead() {
			new Thread(() =>
			{
			var result = new HttpServerRequest().PushSerivceMarkAllMessageRead();
			if (result)
			{
			Utlis.WriteLine("标记成功");
			}
			else
			{
			Utlis.WriteLine("标记失败");
			}


			})
			{ IsBackground = true }.Start();
			}


			}

			/// <summary>
			@@ -513,7 +629,7 @@
			///
			/// Default：分享与功能；Alarm：报警类；Prompt：系统消息
			/// </summary>
			public int pushType;
			public string pushType;
			/// <summary>
			/// 消息主题
			/// </summary>
			@@ -522,14 +638,14 @@
			/// 消息内容
			/// </summary>
			public string messageContent;
			/// <summary>
			/// 扩展数据
			/// </summary>
			public string messageExpand;
			/// <summary>
			/// 消息类型；0：提示；1：报警；2：丰林可是对讲呼叫；3：强制下线推送
			/// </summary>
			public string messageType;
			///// <summary>
			///// 扩展数据
			///// </summary>
			//public string messageExpand;
			///// <summary>
			///// 消息类型；0：提示；1：报警；2：丰林可是对讲呼叫；3：强制下线推送
			///// </summary>
			//public string messageType;
			/// <summary>
			/// 是否已读
			/// </summary>